Merge remote-tracking branch 'upstream/master'

diff --cc example/settings.py
index a3eba500847773d6819cb51cdf458cb754408be6,70cf2ac48ed85ee4b4fd117d45196d4148553397..e340936bd2a5c5e44c5bc170fe7e8c03544fb1cd
--- 1/example/settings.py
--- 2/example/settings.py
+++ b/example/settings.py
@@@ -69,13 -69,9 +69,14 @@@ AUTHENTICATION_BACKENDS = 
      'social_auth.backends.google.GoogleBackend',
      'social_auth.backends.yahoo.YahooBackend',
      'social_auth.backends.contrib.linkedin.LinkedinBackend',
+     'social_auth.backends.contrib.flickr.FlickrBackend',
      'social_auth.backends.OpenIDBackend',
      'social_auth.backends.contrib.livejournal.LiveJournalBackend',
 +    'social_auth.backends.contrib.vkontakte.VKontakteBackend',
 +    'social_auth.backends.contrib.yandex.YandexBackend',
 +    'social_auth.backends.contrib.odnoklassniki.OdnoklassnikiBackend',
 +    'social_auth.backends.contrib.vkontakte.VKontakteOAuth2Backend',
 +    'social_auth.backends.contrib.mailru.MailruBackend',
      'django.contrib.auth.backends.ModelBackend',
  )
  

diff --cc setup.py
index 4f81555f26b9f48128573b8f8be63f8443e75aa0,9d6f9b2f7cac7cfd99297005137e9b7f5d0874c1..171c7aee088002b001ec4f2983abc6b0279c4771
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -34,9 -34,11 +34,10 @@@ setup(name='django-social-auth'
        url='https://github.com/omab/django-social-auth',
        packages=['social_auth',
                  'social_auth.backends',
-                 'social_auth.backends.contrib'],
+                 'social_auth.backends.contrib',
+                 'social_auth.backends.pipeline'],
        long_description=long_description(),
 -      install_requires=['django>=1.2.5',
 -                        '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

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