]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:54:51 +0000 (15:54 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:54:51 +0000 (15:54 -0700)
commitf4c8c6b8de9c74db6c4a95fc88120de9e4455f55
tree0664304a2a9579d60db2441f17cac4fbea6b3bed
parent9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba
parentcc670fb3b1294a348e9afa03b75cbed8eb08ca36
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.5.1

Conflicts:
CHANGELOG
Modulefile
CHANGELOG