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

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec