From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 17 Jun 2016 23:57:21 +0000 (-0300)
Subject: Merge remote-tracking branch 'shared/master' into upstream
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c38a65d0c8565ebe3d22a72c396f233929b93287;p=puppet-postfix.git

Merge remote-tracking branch 'shared/master' into upstream

Conflicts:
	manifests/init.pp
	templates/master.cf.debian-7.erb
---

c38a65d0c8565ebe3d22a72c396f233929b93287