fixup! Upgraded to Django 1.5
Merge pull request #6003 from rmoch/django-upgrade

fixup! Upgraded to Django 1.5