Automatic commit of package [pulp-puppet] release [2.4.4-0.2.beta].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
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