]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.5.x'
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 18:11:11 +0000 (11:11 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 18:11:11 +0000 (11:11 -0700)
commit7d8df4b99829d2afe1b13d667bb2e0fbd0374412
tree40bb15194a6b334cf9ca2439c3cfa65d5d71ab3c
parenta748735f4637089dbbee7920b70f5a7033148c0c
parent88af331b0e9b0e8c8a3c1e74e4c5598dc7b8e1c8
Merge branch '2.5.x'

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.0

Conflicts:
CHANGELOG
Modulefile
CHANGELOG