From: Adrien Thebo <git@somethingsinistral.net>
Date: Wed, 27 Mar 2013 21:04:00 +0000 (-0700)
Subject: Merge branch '2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=87c0f0c45418b276942e3de6deb8a2b681566019;p=puppet-stdlib.git

Merge branch '2.x' into 3.x
---

87c0f0c45418b276942e3de6deb8a2b681566019