Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / LICENSE
2009-03-18 Chris WilliamsAdded some documentation and a license