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
update pulp_docker doc URL
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