Merge branch 'master' of https://github.com/ryr/django-social-auth

author ryr <ryr1986@gmail.com>

Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)

committer ryr <ryr1986@gmail.com>

Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)
author ryr <ryr1986@gmail.com>
Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)
committer ryr <ryr1986@gmail.com>
Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)
diff --cc social_auth/backends/contrib/vkontakte.py
Simple merge
author	ryr <ryr1986@gmail.com>
	Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)
committer	ryr <ryr1986@gmail.com>
	Fri, 29 Jul 2011 06:05:18 +0000 (13:05 +0700)