Merge branch 'use-django-user-model'
authorSofia Papagiannaki <papagian@gmail.com>
Mon, 23 Jan 2012 14:57:59 +0000 (16:57 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Mon, 23 Jan 2012 14:57:59 +0000 (16:57 +0200)
commit6b4f9fb2d88f79a37c29ca568bb2ade91f6a8fd3
treeb1e61d9635df4dc75170d0e3629bd247783a1f5d
parentaba1e49883a27ddc68157f3e7c200be5d21f6a5d
parent7237f8c01223780c0b33fcc3e5aac17fcd1d2c03
Merge branch 'use-django-user-model'

Conflicts:
astakos/middleware/auth.py
astakos/im/api.py
astakos/im/forms.py
astakos/im/models.py
astakos/im/target/invitation.py
astakos/im/target/local.py
astakos/im/target/shibboleth.py
astakos/im/target/twitter.py
astakos/im/target/util.py
astakos/im/urls.py
astakos/im/util.py
astakos/im/views.py