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

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

0adcf646b85ea3379ac8cb25050d445e577b71a3