From: deyk <deyk@crossway.org>
Date: Wed, 11 Apr 2012 21:51:54 +0000 (-0700)
Subject: Moved `merge` argument into `**kwargs`.
X-Git-Tag: 22.4~35
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/95d7d2c185aed481717d333e386dc0afc8465e19?ds=sidebyside;hp=95d7d2c185aed481717d333e386dc0afc8465e19

Moved `merge` argument into `**kwargs`.
---