use "master" as version
can't enter state LMTP_BYE in switch since it's an exit condition
at the loop level
Merge branch 'master' of ssh://ssh.poolp.org/git/opensmtpd
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.h
fix typo
Merge branch 'master' into portable