Django 1.4 compatibility
Merge pull request #1 from ninjascribble/master

Django 1.4 compatibility