Automatic commit of package [pulp-rpm] release [2.1.3-1].
Merge branch 'pulp-2.1' into pulp-2.2

Conflicts:
	pulp_rpm/plugins/importers/yum_importer/importer_rpm.py
Merge branch 'pulp-2.2', pre-build.