]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.2.x' into 2.3.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 22:20:28 +0000 (15:20 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 22:20:28 +0000 (15:20 -0700)
commitfea0b06bc828f452900943db962f4f7645bb0802
treeaf2b3e2db28fb5a9de84d0b9be908950cc852d81
parent6b8f9dd329b40e1598fffde540b7cd59ddae9c2e
parent10c793f8f0bca08a42237bddd18100e649e80df1
Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  (#13494) Specify the behavior of zero padded strings
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
CHANGELOG
Modulefile
CHANGELOG
Modulefile