Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / admin.py
2009-03-17 Chris WilliamsFirst commit