From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Jan 2013 20:25:46 +0000 (-0200)
Subject: Merge branch 'master' of ssh://labs.riseup.net/shared-postfix
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7cc8c05c571d18b9a39eb5643dd9af26d31005ff;p=puppet-postfix.git

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
---

7cc8c05c571d18b9a39eb5643dd9af26d31005ff