From: Micah <micah@riseup.net>
Date: Sat, 28 Feb 2015 16:44:30 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bf746f2f9caacd869a252c7f09cde93c0e577e09;p=puppet-common.git

Merge branch 'master' into 'master'

Merge with immerda

See merge request !1
---

bf746f2f9caacd869a252c7f09cde93c0e577e09