Merge branch 'master' of git://github.com/eykd/django-cas-provider
authordeyk <deyk@crossway.org>
Tue, 7 Feb 2012 19:40:39 +0000 (11:40 -0800)
committerdeyk <deyk@crossway.org>
Tue, 7 Feb 2012 19:40:39 +0000 (11:40 -0800)

Trivial merge