Remove nightly from tito.props.
1009429 - Document the selinux boolean.

https://bugzilla.redhat.com/show_bug.cgi?id=1009429
Merge pull request #135 from pulp/rbarlow-nightly

Remove nightly from tito.props.
1149894 - Adjusts installdistributor to pick the correct temp dir
1103232 - Document proxy settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1103232
1103232 - Reference Pulp docs for proxy settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1103232
Removed a stray sentence.
Merge branch '2.4-dev' into 2.5-testing
Adds 'pulp' as prefix for temp directories for installdistributor
Merge pull request #138 from bmbouter/1149894

1149894 - Has tempdir selection for installdistributor use get_parent_directory from platform
Rework verbiage after PR review.
Merge branch '1009429' into 2.5-testing
fixing install instructions to match pulp 2.4
Automatic commit of package [pulp-puppet] release [2.4.2-0.1.beta].
Automatic commit of package [pulp-puppet] release [2.5.0-0.8.beta].
Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Automatic commit of package [pulp-puppet] release [2.4.2-1].
1150297 - Change all 2.4.x versions to 2.5.0.

https://bugzilla.redhat.com/show_bug.cgi?id=1150297
Merge remote-tracking branch 'origin/2.4-release' into 2.4-testing

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing

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