]> gitweb.fluxo.info Git - puppet-postfix.git/commit
Merge remote-tracking branch 'shared/master' into upstream master
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jun 2016 23:57:21 +0000 (20:57 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 17 Jun 2016 23:57:21 +0000 (20:57 -0300)
commitc38a65d0c8565ebe3d22a72c396f233929b93287
tree90592df1a872e4f2a1c571a25b9552688df16690
parent50a114ab258bd5b9186b61a9c73d82f2ffdab3f6
parent969076a813b88dafd222c413bf6fbabab837eafb
Merge remote-tracking branch 'shared/master' into upstream

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