django/django — pull request #83 by datajockey (2012-05-20 02:06:57+00:00)
Title: Resolves a couple of testing issues with Flatpages

Resolves a couple of issues with running Flatpages tests by...
- Creating an example_site fixture
- Overriding project SITE_ID setting to 1
- Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID

Conflicts:

AUTHORS
django/contrib/flatpages/tests/csrf.py
django/contrib/flatpages/tests/middleware.py
django/contrib/flatpages/tests/templatetags.py
django/contrib/flatpages/tests/views.py