From: Micah <micah@riseup.net>
Date: Fri, 20 Feb 2015 22:26:45 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=877134184b26c0ff326d46ff332f287d9e8a1be1;p=puppet-postfix.git

Merge branch 'master' into 'master'

Merge with cmaisonnneuve and immerda

This version should be compatible with the cleaned up common module.

See merge request !1
---

877134184b26c0ff326d46ff332f287d9e8a1be1