Added by Sofia Papagiannaki over 12 years ago
Merge branch 'use-django-user-model'
Conflicts: astakos/middleware/auth.py