Automatic commit of package [pulp-puppet] release [2.5.1-0.1.beta].
Merge remote-tracking branch 'origin/2.5-testing' into 2.6-dev

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet