Merge remote-tracking branch 'cas2/master'
authordeyk <deyk@crossway.org>
Fri, 13 Apr 2012 22:25:48 +0000 (15:25 -0700)
committerdeyk <deyk@crossway.org>
Fri, 13 Apr 2012 22:26:25 +0000 (15:26 -0700)
commit82555c55f77395067231c1c22685597f12706902
tree2f18a925818527551397684994c1f91b03680bd1
parent8ace0586471d741bbe1d55dca48f524a3d385852
parent611a6c53c6fe16bee0673b0a815d1f35ce303360
Merge remote-tracking branch 'cas2/master'

Conflicts:
.gitignore
cas_provider/forms.py
cas_provider/models.py
cas_provider/urls.py
cas_provider/views.py

Merged from https://github.com/castlabs/django-cas-provider

PT #27996721
cas_provider/forms.py
cas_provider/urls.py
cas_provider/views.py