]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '3.x' into 4.x
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:18:53 +0000 (16:18 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:18:53 +0000 (16:18 -0700)

Trivial merge