From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 15 Jan 2015 16:44:20 +0000 (-0800)
Subject: Merge pull request #402 from cyberious/4.6.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=71a7a47d3cf9b7fa73879828eb799b22354dc797;p=puppet-stdlib.git

Merge pull request #402 from cyberious/4.6.x

Merge 4.5.x into 4.6.x
---

71a7a47d3cf9b7fa73879828eb799b22354dc797