Automatic commit of package [pulp-puppet] release [2.4.2-1].
Merge remote-tracking branch 'origin/2.4-release' into 2.4-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing

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