]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '3.1.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 23:06:29 +0000 (16:06 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 23:06:29 +0000 (16:06 -0700)
* 3.1.x:
  Update CHANGELOG, Modulefile for 3.1.1

1  2 
CHANGELOG

diff --cc CHANGELOG
Simple merge