Merge branch '2.5-testing' into 2.5-dev
Automatic commit of package [pulp-puppet] release [2.5.0-0.16.rc].
Merge branch '2.5-testing' into 2.5-dev
1146916 - pulp-puppet-module-builder now builds modules without init.pp files
Merge pull request #150 from jeremycline/2.5-dev

1146916 - pulp-puppet-module-builder now builds modules without init.pp files
Automatic commit of package [pulp-puppet] release [2.5.0-0.17.rc].
1145713 - add python-pulp-puppet-common as dep to tools rpm
Merge pull request #151 from beav/fixdep

1145713 - add python-pulp-puppet-common as dep to tools rpm
Automatic commit of package [pulp-puppet] release [2.5.0-0.17.rc].

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Merge remote-tracking branch 'origin/2.5-dev'
Automatic commit of package [pulp-puppet] release [2.5.0-0.18.rc].
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Automatic commit of package [pulp-puppet] release [2.5.0-0.19.rc].
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'