From: Adrien Thebo Date: Mon, 18 Mar 2013 22:37:56 +0000 (-0700) Subject: Merge branch '2.x' into 3.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c0a0682706ccc1ed8c927c5529c08ffe2a7a4a5e;p=puppet-stdlib.git Merge branch '2.x' into 3.x --- c0a0682706ccc1ed8c927c5529c08ffe2a7a4a5e