]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.1.x' into 2.2.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 22:19:21 +0000 (15:19 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 22:19:21 +0000 (15:19 -0700)
commit10c793f8f0bca08a42237bddd18100e649e80df1
tree6af2a0d42da80fc4f6698a0239278d0076a3cb07
parent60afdeda17f9672405d9f425fcc1b08f61f9adda
parenta033450ab32e8963d3124068b442bef636e25b5c
Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
CHANGELOG
Modulefile
CHANGELOG
Modulefile