1021579 - document unexpected behavior in unassociate api
PEP-8 test_content_sources.py.
Add a flake8.cfg.
PEP-8 the content sources model tests.
remove unnecessary return
Spec file fixes for pulp on RHEL 5 and RHEL 6

python-sphinx is called python-sphinx10 in EPEL 6. Additionally, there was a
bash_completion error when building on RHEL 5.

Note that on RHEL 5, we do not include man pages for pulp-consumer. This is
because the version of python-sphinx is too old to build the man pages.
PEP-8 test_descriptor.py.
Merge branch 'release-notes' into 2.6-dev
Merge pull request #1349 from mhrivnak/release-notes-again

minor edit to release notes
Merge branch 'release-notes-again' into 2.6-dev
1162820 - Clarify SSL configuration settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1162820
Merge branch '1162820' into 2.4-release
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-dev' into 2.5-testing
Merge branch '2.5-testing' into 2.6-dev
Merge branch '2.6-dev'
Merge branch 'pep8-test_content_sources'
Merge branch 'flake8'
Merge branch 'pep8-content_sources_model' into 2.6-dev
Merge branch '2.6-dev'