Merge branch 'master' of git://github.com/eykd/django-cas-provider
[django-cas-provider.git] / cas_provider / templates / cas / merge.html
2012-01-18 dwickwireAdding basic merge template