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

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

085a0564428d49a027af0fc224fb4019fba54862