]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge pull request #402 from cyberious/4.6.x
authorMorgan Haskel <morgan@puppetlabs.com>
Thu, 15 Jan 2015 16:44:20 +0000 (08:44 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Thu, 15 Jan 2015 16:44:20 +0000 (08:44 -0800)
Merge 4.5.x into 4.6.x


Trivial merge