From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 15 Jan 2015 21:59:53 +0000 (-0800)
Subject: Merge pull request #403 from cyberious/master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5863ab3901368310186790980aea2b0bf7cecb06;p=puppet-stdlib.git

Merge pull request #403 from cyberious/master

Merge 4.6.x back to master
---

5863ab3901368310186790980aea2b0bf7cecb06