]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.1.x' into 2.2.x
authorJeff McCune <jeff@puppetlabs.com>
Fri, 30 Dec 2011 20:19:15 +0000 (12:19 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Fri, 30 Dec 2011 20:19:15 +0000 (12:19 -0800)
commited0de46a2a0661a2457e5fed43a5c76f77414704
treefc19a51734b04ec1af865679e16d8b4d2a29a174
parent80c9a8feeae6203026f61215e100e95078c61a04
parent842b0aa19cecf8251c69cb29fba59c985841c615
Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update Modulefile CHANGELOG for v2.1.2 release

Conflicts:
CHANGELOG
Modulefile
CHANGELOG