]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'master' into 4.4.x
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 10 Nov 2014 21:42:28 +0000 (13:42 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 10 Nov 2014 21:42:28 +0000 (13:42 -0800)

Trivial merge