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

author	Jeff McCune <jeff@puppetlabs.com>
	Thu, 25 Oct 2012 22:43:51 +0000 (15:43 -0700)
committer	Jeff McCune <jeff@puppetlabs.com>
	Thu, 25 Oct 2012 22:43:51 +0000 (15:43 -0700)
commit	2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0
tree	bb8d8d9e523099649b196b860822385ef8ffc29b	tree \| snapshot
parent	1d371ab8b67b85d52f8c4932f78660de8a236b93	commit \| diff
parent	9e8c60a8b73fd96393b08d690c7197e62aae623e	commit \| diff

Merge branch '3.0.x' into 3.1.x

* 3.0.x:
Revert "Merge branch '2.5.x' into 3.0.x"