Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr
Conflicts:
manifests/init.pp
- [DH] files/dovecot/10-auth.conf
- [DH] files/dovecot/10-mail.conf
- [DH] files/dovecot/10-master.conf
- [DH] files/postfix/master.cf
- [DH] files/procmailrc
- [DH] files/slapd/slapd.default
- [DH] files/spamassassin/local.cf