Automatic commit of package [pulp-rpm] release [2.4.1-1].
Merge branch '2.4-dev' into 2.5-testing

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