Introduce Django 1.4 compatibility
Merge pull request #91 from aniav/django-1.4

Introduce Django 1.4 compatibility