Update content.py
Update constants.py
Update puppet.py
Update AUTHORS
Merge (-s ours) pulp-2.4 => master, post-build
fixes according to comments in pull request #121
Removed unnecessary import
Merge pull request #1 from doddo/pgustafs-1099456

fixes according to comments in pull request #121
Fixed tests and comments according to comments in pull-req #121
Merge pull request #2 from christoe/pgustafs-1099456

Fixed tests and comments according to comments in pull-req #121
Merge branch 'pr/121'
Merge branch 'pulp-2.4'

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge branch 'pulp-2.4'
Merge branch 'pulp-2.4'
Merge (-s ours) pulp-2.4 => master, post-build
Merge (-s ours) pulp-2.4 => master, post-build
Merge branch 'pulp-2.4'
Merge branch 'pulp-2.4'
Merge branch 'master' of github.com:pulp/pulp_puppet
Merge branch 'pulp-2.4'