1158138, 1113629 - Allow '.' in logins, permissions
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-testing
Merge branch 'gofer-1.3.1' into 2.5-release
Merge branch '2.5-testing' of github.com:pulp/pulp into 2.5-testing
Merge branch '2.5-release' into 2.5-testing
fix merge conflicts in changelog
update pulp_docker doc URL
PEP 8 the client commands consumer dir
:
Merge pull request #1361 from beav/url-fix

update pulp_docker doc URL
Merge remote-tracking branch 'origin/2.5-release' into 2.5-testing
Merge remote-tracking branch 'origin/2.5-testing' into 2.6-dev
Merge pull request #1364 from asmacdo/pep8-client-commands

PEP 8 the client commands consumer dir
merge 1299