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

Conflicts:
	pulp-rpm.spec
Merge branch '2.5-dev' into 2.6-dev

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
Automatic commit of package [pulp-rpm] release [2.4.4-0.3.beta].
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' into 2.6-dev
Automatic commit of package [pulp-rpm] release [2.5.2-0.1.rc].
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev' into 2.6-dev

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
adding mock patches for TaskStatus model instead of task_status_manager which doesn't exist anymore
Add release notes for 2.5.2.
Merge branch '2.5-testing' into 2.5-dev

Conflicts:
	docs/user-guide/release-notes/2.5.x.rst
Merge branch '2.5-dev' into 2.6-dev
Merge branch '2.6-dev'