From: Adrien Thebo Date: Tue, 25 Mar 2014 20:26:00 +0000 (-0700) Subject: Merge branch '3.x' into 4.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bc143815739f365f6d8b44a931a6d569d6815ed0;p=puppet-stdlib.git Merge branch '3.x' into 4.x --- bc143815739f365f6d8b44a931a6d569d6815ed0