From: Hunter Haugen Date: Tue, 18 Mar 2014 23:18:53 +0000 (-0700) Subject: Merge branch '3.x' into 4.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45;p=puppet-stdlib.git Merge branch '3.x' into 4.x --- aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45