]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '3.x' into 4.x
authorJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 22:39:34 +0000 (14:39 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 22:39:34 +0000 (14:39 -0800)
* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0


Trivial merge