From: deyk Date: Fri, 13 Apr 2012 22:25:48 +0000 (-0700) Subject: Merge remote-tracking branch 'cas2/master' X-Git-Tag: 22.4~32 X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/82555c55f77395067231c1c22685597f12706902?hp=82555c55f77395067231c1c22685597f12706902 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 ---