]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 22:39:29 +0000 (14:39 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 22:39:29 +0000 (14:39 -0800)
commit1e5618c44f1c4ad14c7ba1b3981e950ce7182276
treee4770f5c660fd3dae47d6ef1324b514d726af263
parent16fe71867c997dd24a34aa088def7a1fa4cb5051
parent2b7591896d790a17f902fbafc2aed8743dc674f2
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
CHANGELOG
Modulefile
CHANGELOG