Automatic commit of package [pulp-puppet] release [2.5.2-0.0.beta].
Merge branch '2.5-testing' into 2.5-dev

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge branch '2.5-dev' into 2.6-dev

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