]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Fri, 25 Mar 2011 10:00:49 +0000 (13:00 +0300)
committerStas Kravets <skravets@applebough.(none)>
Fri, 25 Mar 2011 10:00:49 +0000 (13:00 +0300)
commitf7f286c92868b873001aeb0475b9b327e112f9c9
tree8cd5fb04975a43d98ae1d9474d1e13d465611db4
parentd0c94625f5d3e97d9ff7be52edcfa9cc7c117392
parent5d610a5b82dbaf68a7471939794699ed6524072f
Merge remote branch 'upstream/master'

Conflicts:
setup.py
social_auth/backends/__init__.py