]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.x' into 3.x
authorAdrien Thebo <git@somethingsinistral.net>
Mon, 18 Mar 2013 22:37:56 +0000 (15:37 -0700)
committerAdrien Thebo <git@somethingsinistral.net>
Mon, 18 Mar 2013 22:37:56 +0000 (15:37 -0700)

Trivial merge