Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / exceptions.py
2012-01-18 deykAdded support for handling user-merging workflows at...