Merge remote branch 'upstream/master'

Conflicts:
	example/app/views.py

diff --cc example/app/views.py
index 16cdb962b27c286f16396869f918893583e0b583,a17a0cf54b7913b194acb9793bcf77081d8b0131..ba1fe2222af5dec31b497c16e1118f0ae441ea6b
--- 1/example/app/views.py
--- 2/example/app/views.py
+++ b/example/app/views.py
@@@ -4,6 -5,9 +5,8 @@@ from django.contrib.auth.decorators imp
  from django.template import RequestContext
  from django.shortcuts import render_to_response
  
 -
+ from social_auth import __version__ as version
+ 
  def home(request):
      """Home view, displays login mechanism"""
      if request.user.is_authenticated():

diff --cc example/local_settings.py.template
index 0729e75ae0dbd44796edab517f9e1051dbff98fa,ded4b1563b8d007c4b98526cc4fc8d20fd14a130..8138182d4b8d1c636c5e727a0aa57bf9d57f8ac6
--- 1/example/local_settings.py.template
--- 2/example/local_settings.py.template
+++ b/example/local_settings.py.template
@@@ -9,6 -9,5 +9,7 @@@ SOCIAL_AUTH_FORCE_RANDOM_USERNAME = Fal
  SOCIAL_AUTH_DEFAULT_USERNAME      = 'socialauth_user'
  SOCIAL_AUTH_COMPLETE_URL_NAME     = 'complete'
  LOGIN_ERROR_URL                   = '/login/error/'
 +VKONTAKTE_APP_ID                  = ''
 +VKONTAKTE_APP_SECRET              = ''
  #SOCIAL_AUTH_USER_MODEL            = 'app.CustomUser'
+ SOCIAL_AUTH_ERROR_KEY             = 'socialauth_error'