Merge remote branch 'upstream/master'

Conflicts:
	setup.py

diff --cc example/local_settings.py.template
Simple merge

diff --cc example/settings.py
index 935afe843e6bcba2ceaec77ea03a973681c2936b,a0474cc9e1e76683c899172b56de3524a7b72a09..f0332621d0e4981460fe53a25fc2653be0f68374
--- 1/example/settings.py
--- 2/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 example/templates/done.html
Simple merge

diff --cc example/templates/home.html
Simple merge

diff --cc setup.py
index 478f0334314244fbaeeaf07ab244ae1e0f9234f7,cab3e9b7287c38e88f4a019426099e01062e4034..1119614b2a12e3801e67db34a43663495c11734c
--- 1/setup.py
--- 2/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',

diff --cc social_auth/backends/__init__.py
Simple merge