]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '4.x'
authorAdrien Thebo <git@somethingsinistral.net>
Mon, 8 Apr 2013 17:06:17 +0000 (10:06 -0700)
committerAdrien Thebo <git@somethingsinistral.net>
Mon, 8 Apr 2013 17:06:17 +0000 (10:06 -0700)

Trivial merge