Merge branch 'master' into portable
userinfo format has changed
unbreak table_sqlite.c for USERINFO and CREDENTIALS
Merge branch 'portable' of /git/opensmtpd into portable
Merge branch 'master' into portable