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

Trivial merge