Automatic commit of package [pulp-puppet] release [2.5.0-1].
Merge branch '2.5-release' of github.com:pulp/pulp_puppet into 2.5-release
fix merge conflicts in changelog
Removes '-u admin' when its not necessarily required
Merge pull request #157 from bmbouter/removes-admin-from-docs

Removes '-u admin' when its not necessarily required