From: Stas Kravets <skravets@applebough.(none)>
Date: Thu, 10 Mar 2011 13:26:53 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b76add6723bba3d49afc64dde29f624d3db516be;p=django-social-auth.git

Merge remote branch 'upstream/master'

Conflicts:
	setup.py
---

b76add6723bba3d49afc64dde29f624d3db516be
diff --cc example/settings.py
index 935afe8,a0474cc..f033262
--- a/example/settings.py
+++ b/example/settings.py
@@@ -67,10 -67,9 +67,11 @@@ AUTHENTICATION_BACKENDS = 
      'social_auth.backends.google.GoogleOAuthBackend',
      'social_auth.backends.google.GoogleBackend',
      'social_auth.backends.yahoo.YahooBackend',
+     'social_auth.backends.contrib.linkedin.LinkedinBackend',
      'social_auth.backends.OpenIDBackend',
      'social_auth.backends.contrib.livejournal.LiveJournalBackend',
 +    'social_auth.backends.contrib.vkontakte.VKontakteBackend',
 +    'social_auth.backends.contrib.yandex.YandexBackend',
      'django.contrib.auth.backends.ModelBackend',
  )
  
diff --cc setup.py
index 478f033,cab3e9b..1119614
--- a/setup.py
+++ b/setup.py
@@@ -36,7 -36,8 +36,7 @@@ setup(name='django-social-auth'
                  'social_auth.backends',
                  'social_auth.backends.contrib'],
        long_description=long_description(),
-       install_requires=['oauth>=1.0',
 -      install_requires=['django>=1.2',
 -                        'oauth2>=1.5.167',
++      install_requires=['oauth2>=1.5.167',
                          'python_openid>=2.2'],
        classifiers=['Framework :: Django',
                     'Development Status :: 4 - Beta',