Squash changelog entries for old pre-releases.
Merge branch 'squash_changelog' into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Automatic commit of package [pulp-rpm] release [2.5.0-0.9.beta].
Automatic commit of package [pulp-rpm] release [2.5.0-0.10.beta].
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Merge remote-tracking branch 'origin/2.5-dev'
Merge the Sphinx projects into one.
Merge branch 'merge_docs'

Conflicts:
	docs/tech-reference/conf.py