From: Stas Kravets <skravets@applebough.(none)>
Date: Mon, 14 Feb 2011 08:54:58 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0577db6d68c6d3ff1a02bac0653fec8fd14e1040;p=django-social-auth.git

Merge remote branch 'upstream/master'

Conflicts:
	example/app/views.py
---

0577db6d68c6d3ff1a02bac0653fec8fd14e1040
diff --cc example/app/views.py
index 16cdb96,a17a0cf..ba1fe22
--- a/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 0729e75,ded4b15..8138182
--- a/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'