From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 23 May 2012 17:47:16 +0000 (-0700)
Subject: Merge branch '2.3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=380f9b66fe9d9b5e246d426095762a331386cf2a;p=puppet-stdlib.git

Merge branch '2.3.x'

* 2.3.x:
  fix regression in #11017 properly
---

380f9b66fe9d9b5e246d426095762a331386cf2a