Django 1.5 changes
Merge pull request #1 from alekseyev/master

Switch to Django 1.5