Merge remote-tracking branch 'fcurella/patch-1'

Conflicts:
	social_auth/views.py

diff --cc social_auth/views.py
index 4ba2b8330a70a801235a2929f7d87c9becbb16a4,dede174894e9f34cee743fa921ea1c0a75f56d7d..c741fd30d99a227e3b9876d750694fefaf7d9da2
--- 1/social_auth/views.py
--- 2/social_auth/views.py
+++ b/social_auth/views.py
@@@ -52,14 -48,15 +52,14 @@@ def complete_process(request, backend)
  
      if user and getattr(user, 'is_active', True):
          login(request, user)
 -        if getattr(settings, 'SOCIAL_AUTH_SESSION_EXPIRATION', True):
++        # user.social_user is the used UserSocialAuth instance defined
++        # in authenticate process
+         social_user = user.social_user
+ 
 +        if SESSION_EXPIRATION :
              # Set session expiration date if present and not disabled by
              # setting. Use last social-auth instance for current provider,
              # users can associate several accounts with a same provider.
--            #
--            # user.social_user is the used UserSocialAuth instance defined
--            # in authenticate process
-             social_user = user.social_user
              if social_user.expiration_delta():
                  request.session.set_expiry(social_user.expiration_delta())