Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / management / commands /
2009-03-18 Chris WilliamsAdded some documentation and a license
2009-03-17 Chris WilliamsRemoved some old SVN junk
2009-03-17 Chris WilliamsFirst commit