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