]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '4.x'
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 19:01:46 +0000 (12:01 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 19:01:46 +0000 (12:01 -0700)
* 4.x:


Trivial merge