Upgraded to Django 1.6.
Merge pull request #66 from django/django1.6

Upgraded to Django 1.6.