]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorryr <ryr1986@gmail.com>
Thu, 18 Aug 2011 11:23:32 +0000 (18:23 +0700)
committerryr <ryr1986@gmail.com>
Thu, 18 Aug 2011 11:23:32 +0000 (18:23 +0700)
commit69f1ccbe88605d1c8296cb0201596a76bb86d62f
tree9c1a458a780e9b6cf11b88399821409d34411aba
parentb81a22dfd12ded0b98ad4c120f33752078b911d6
parent108292071ae10d06913025da052a1459f06b1879
Merge remote-tracking branch 'upstream/master'

Conflicts:
social_auth/__init__.py
social_auth/backends/contrib/vkontakte.py
social_auth/views.py
social_auth/backends/__init__.py
social_auth/backends/contrib/vkontakte.py
social_auth/views.py