]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Tue, 1 Feb 2011 10:44:39 +0000 (13:44 +0300)
committerStas Kravets <skravets@applebough.(none)>
Tue, 1 Feb 2011 10:44:39 +0000 (13:44 +0300)
commit024761af524c554497becd2643cf979697b32592
treea1c26c01e43b97bdf5154340207fa0fde760cf6b
parent96f1f8ecf25dfc016daf40ffe54b4f859abd90a6
parent274741adc51c5bc8dbe00cd9dda19ae20459c7b0
Merge remote branch 'upstream/master'

Conflicts:
social_auth/backends/contrib/livejournal.py
social_auth/backends/__init__.py