Moved `merge` argument into `**kwargs`.
authordeyk <deyk@crossway.org>
Wed, 11 Apr 2012 21:51:54 +0000 (14:51 -0700)
committerdeyk <deyk@crossway.org>
Wed, 11 Apr 2012 21:51:54 +0000 (14:51 -0700)
commit95d7d2c185aed481717d333e386dc0afc8465e19
treea4985c2e0d3b9cda750f94323b41454a4e91a105
parent0b76f6154ffb5fabd7c0cd22ff3f2720cedeb48f
Moved `merge` argument into `**kwargs`.
cas_provider/views.py