Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / utils.py
2009-10-02 zuberUse string.ascii_letters instead of string.letters...
2009-03-18 Chris WilliamsAdditional documentation and cleaned up imports in...
2009-03-17 Chris WilliamsFirst commit