From: Adrien Thebo <git@somethingsinistral.net>
Date: Mon, 8 Apr 2013 17:06:17 +0000 (-0700)
Subject: Merge branch '4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6f9361e383982c5b719bbdf17ed72b85850b9d91;p=puppet-stdlib.git

Merge branch '4.x'
---

6f9361e383982c5b719bbdf17ed72b85850b9d91