]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'master' into 4.5.x
authorTravis Fields <travis@puppetlabs.com>
Wed, 14 Jan 2015 01:16:10 +0000 (17:16 -0800)
committerTravis Fields <travis@puppetlabs.com>
Wed, 14 Jan 2015 01:16:10 +0000 (17:16 -0800)

Trivial merge