formating
Merge branch 'master' of ssh.poolp.org:/git/opensmtpd
Merge branch 'master' into portable
sync portable OpeSSH m4/aclocal-openssh.m4 (missed in the last configure.ac sync)
Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable