correction
Merge branch 'master' of https://github.com/mortenwh/django-userena