From: ryr Date: Thu, 18 Aug 2011 11:28:43 +0000 (+0700) Subject: Merge branch 'master' of https://github.com/ryr/django-social-auth X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=391d329a523670657636657f7cde04d2671e08c3;p=django-social-auth.git Merge branch 'master' of https://github.com/ryr/django-social-auth Conflicts: social_auth/backends/contrib/vkontakte.py --- 391d329a523670657636657f7cde04d2671e08c3