Merge pull request #384 from niftynei/master

Adds convenience querystring for login redirects

diff --cc doc/configuration.rst
Simple merge

diff --cc social_auth/context_processors.py
index 129c5b84e0d7faf618cb0e277022fcf14500bfb8,f4e194b2dcbd92fc9160f3a8e2243dc25b2df0f7..6a444239b51754dc9fd0e48e862344f9cfc77e88
--- 1/social_auth/context_processors.py
--- 2/social_auth/context_processors.py
+++ b/social_auth/context_processors.py
@@@ -1,7 -1,9 +1,9 @@@
 +from social_auth.models import UserSocialAuth
  from social_auth.backends import get_backends
  from social_auth.utils import group_backend_by_type
 -from social_auth.models import User
  
+ from django.contrib.auth import REDIRECT_FIELD_NAME as auth_redirect
+ from django.conf import settings
  
  # Note: social_auth_backends, social_auth_by_type_backends and
  #       social_auth_by_name_backends don't play nice together.