Merge branch 'gofer-1.3.1' into 2.5-testing
Merge branch '2.5-testing' of github.com:pulp/pulp into 2.5-testing
Merge branch '2.5-release' into 2.5-testing
Merge remote-tracking branch 'origin/2.5-release' into 2.5-testing
Preparation for gofer 2.0 in f21+
1165355 - Add a sanitize_checksum_type function.

https://bugzilla.redhat.com/show_bug.cgi?id=1165355
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-dev' into 2.5-testing
Automatic commit of package [pulp] release [2.4.4-0.1.beta].
Automatic commit of package [pulp-nodes] release [2.4.4-0.1.beta].
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec
	rel-eng/packages/pulp
	rel-eng/packages/pulp-nodes
Remove client unittest dependency on NamedTuple
Automatic commit of package [pulp] release [2.5.1-0.1.beta].
Automatic commit of package [pulp-nodes] release [2.5.1-0.1.beta].
Merge pull request #1381 from jortel/gofer-lt-2.0

Preparation for gofer 2.0 in f21 and beyond.
Merge branch '2.4-release' into 2.4-testing
Merge branch '2.4-testing' into 2.4-dev
Merge branch 'jenkins-namedtuple' into 2.5-testing
Add release notes for 2.4.4.