]> git.parisson.com Git - django-social-auth.git/commitdiff
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)
Conflicts:
social_auth/backends/contrib/livejournal.py

1  2 
social_auth/backends/__init__.py

Simple merge