Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing · ipanova/pulp_puppet@1aba67e · GitHub

Commit

Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing

Browse files

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet

Loading branch information

beav committed Oct 13, 2014

2 parents de1b80c + ca235d7 commit 1aba67e