gitweb.fluxo.info Git - puppet-stdlib.git/commit

author	Jeff McCune <jeff@puppetlabs.com>
	Thu, 25 Oct 2012 19:00:28 +0000 (12:00 -0700)
committer	Jeff McCune <jeff@puppetlabs.com>
	Thu, 25 Oct 2012 19:00:28 +0000 (12:00 -0700)
commit	1d371ab8b67b85d52f8c4932f78660de8a236b93
tree	4304339b93ca5a0ac044fc43add0b00f3378e0ec	tree \| snapshot
parent	e8fb678c91d25c48c99c6347cda33e26e5142a89	commit \| diff
parent	c8c7afc7a00aaeeddea6514d9fe9508513e53a73	commit \| diff

Merge branch '3.0.x' into 3.1.x

* 3.0.x:

Conflicts:
CHANGELOG
Modulefile