Merge branch 'thankyou' into 2.5-release
Automatic commit of package [pulp] release [2.5.0-1].
Merge branch '2.5-release' of github.com:pulp/pulp into 2.5-release
bump version for release
Automatic commit of package [pulp-nodes] release [2.5.0-1].
fixed rendering of contributor names
Merge pull request #1358 from mhrivnak/fixthanks

fixed rendering of contributor names
Merge branch 'gofer-1.3.1' into 2.5-release
fix merge conflicts in changelog