]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge pull request #403 from cyberious/master
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 15 Jan 2015 21:59:53 +0000 (13:59 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 15 Jan 2015 21:59:53 +0000 (13:59 -0800)
Merge 4.6.x back to master


Trivial merge