]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '4.6.x' back to master
authorTravis Fields <travis@puppetlabs.com>
Thu, 15 Jan 2015 21:55:48 +0000 (13:55 -0800)
committerTravis Fields <travis@puppetlabs.com>
Thu, 15 Jan 2015 21:55:48 +0000 (13:55 -0800)

Trivial merge