]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Thu, 10 Mar 2011 13:26:53 +0000 (16:26 +0300)
committerStas Kravets <skravets@applebough.(none)>
Thu, 10 Mar 2011 13:26:53 +0000 (16:26 +0300)
commitb76add6723bba3d49afc64dde29f624d3db516be
tree7b87dc17ffcbf9f36b36139ec8034238172ea941
parentc040ba8a2d77cb68f544d02f26c2352a0782bcb6
parentba4a609244121f42178d22573b1fc75db51e7b9a
Merge remote branch 'upstream/master'

Conflicts:
setup.py
example/local_settings.py.template
example/settings.py
example/templates/done.html
example/templates/home.html
setup.py
social_auth/backends/__init__.py