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

diff --cc social_auth/backends/contrib/vkontakte.py
Simple merge

diff --cc social_auth/backends/facebook.py
index 0afd11c06db26bb38232e5e5b86aa68b5a0765e8,aa7f6f1670315c94882f82b0c720b26c1f6fe8e1..ec3df0af94e5f13f8a8a0edc35db3967d5457101
--- 1/social_auth/backends/facebook.py
--- 2/social_auth/backends/facebook.py
+++ b/social_auth/backends/facebook.py
@@@ -59,17 -58,16 +59,16 @@@ class FacebookAuth(BaseOAuth)
                  'redirect_uri': self.redirect_uri}
          if hasattr(settings, 'FACEBOOK_EXTENDED_PERMISSIONS'):
              args['scope'] = ','.join(settings.FACEBOOK_EXTENDED_PERMISSIONS)
 -        return FACEBOOK_AUTHORIZATION_URL + '?' + urllib.urlencode(args)
 +        return FACEBOOK_AUTHORIZATION_URL + '?' + urlencode(args)
  
      def auth_complete(self, *args, **kwargs):
+         """Returns user, might be logged in"""
          access_token = None
          expires = None
-         
-         """Returns user, might be logged in"""
-         
+ 
          if 'code' in self.data:
              url = FACEBOOK_ACCESS_TOKEN_URL + '?' + \
 -                  urllib.urlencode({'client_id': settings.FACEBOOK_APP_ID,
 +                  urlencode({'client_id': settings.FACEBOOK_APP_ID,
                                  'redirect_uri': self.redirect_uri,
                                  'client_secret': settings.FACEBOOK_API_SECRET,
                                  'code': self.data['code']})