]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '3.x' into 4.x
authorAdrien Thebo <git@somethingsinistral.net>
Tue, 25 Mar 2014 20:26:00 +0000 (13:26 -0700)
committerAdrien Thebo <git@somethingsinistral.net>
Tue, 25 Mar 2014 20:26:00 +0000 (13:26 -0700)

Trivial merge