url(r'^socialauth-login/$', socialauth_login),
url(r'^validate/', validate),
url(r'^logout/', logout),
- url(r'^merge/', login, {'merge': True, 'template': 'cas/merge.html'})
+ url(r'^login/merge/', login, {'merge': True, 'template_name': 'cas/merge.html'})
)