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

Merge branch '3.x' into 4.x

* 3.x:
---

81b1f1b37665cc6e3afb0ba94b4367bd542a3ccb