]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'fcurella/patch-1'
authorMatías Aguirre <matiasaguirre@gmail.com>
Tue, 21 Jun 2011 03:51:51 +0000 (00:51 -0300)
committerMatías Aguirre <matiasaguirre@gmail.com>
Tue, 21 Jun 2011 03:51:51 +0000 (00:51 -0300)
commit5ce9cde251dbc94fd47a59688ab17ee7e46925d5
tree8a7214d5b4e242e1bce60864aa78f5e39fd3522e
parentb8878afc0dbf50c75677ab3ea1e05073355f0b2f
parent6734dc5252f564deab92e332d0e6328620dc2403
Merge remote-tracking branch 'fcurella/patch-1'

Conflicts:
social_auth/views.py
social_auth/views.py