Merge branch 'master' of ssh://labs.riseup.net/shared-postfix

Conflicts:
	manifests/definitions/header_checks_snippet.pp
	manifests/header_checks.pp
	manifests/header_checks_snippet.pp
	manifests/init.pp
	manifests/tlspolicy.pp
	manifests/virtual_regexp_snippet.pp

diff --cc README
Simple merge

diff --cc manifests/init.pp
Simple merge