fixes bug 1053860 - django 1.4.14/1.5.9/1.6.6 security update (MozTrap)
Merge pull request #73 from peterbe/bug-1053860-django-1414159166-security-update-moztrap

fixes bug 1053860 - django 1.4.14/1.5.9/1.6.6 security update (MozTrap)