From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 19:01:46 +0000 (-0700)
Subject: Merge branch '4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=efb0a85b41b390e14aece19e4473d1171fe64126;p=puppet-stdlib.git

Merge branch '4.x'

* 4.x:
---

efb0a85b41b390e14aece19e4473d1171fe64126