Automatic commit of package [pulp-rpm] release [2.5.0-0.7.beta].
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-testing
1103232 - Document importer settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1103232
Troubleshooting info on RPMs with non UTF-8 fields
Added proper spacing and added proper underline
Removed double space
Updated wording of troubleshooting for non UTF-8 rpms
Merge pull request #573 from dkliban/1131512

1131512 - Troubleshooting info on RPMs with non UTF-8 fields
set distribution filename to PULP_DISTRIBUTION.xml
Merge pull request #575 from pulp/barnabycourt-fix-distribution-filename

set distribution filename to PULP_DISTRIBUTION.xml
Merge branch '2.5-testing' into 2.5-dev
1150714 - delete old distribution units when syncing

Distribution units have a unit key that contains the OS version, as read from
the treeinfo file.

When a new OS version comes out, a directory containing the most recent OS bits
will have a new treeinfo file with a different version and hence different unit
key. However, the old unit is not removed from the repo. This means there are
two distribution units for a single repo, which causes publish to fail.

This patch checks to see if the unit keys of any existing distributions are
different than those of the unit just saved. If so, the incorrect units are
removed, leaving only the latest correct unit.
Automatic commit of package [pulp-rpm] release [2.4.2-0.1.beta].
Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Automatic commit of package [pulp-rpm] release [2.5.0-0.8.beta].
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Merge branch '2.4-testing' into 2.4-release
Automatic commit of package [pulp-rpm] release [2.4.2-1].
Merge branch '1103232' into 2.4-release