]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Fri, 13 Apr 2012 14:42:33 +0000 (18:42 +0400)
committerStas Kravets <krvss@mail.ru>
Fri, 13 Apr 2012 14:42:33 +0000 (18:42 +0400)
commit772903287355b5ef88046c559bda23858120e887
treec4dc5a47f1cbfe0b4cf6ed72d9b31bf7368c2f69
parent041354bda1969155f00780aa7e63b1cf24771a18
parent4596acead712a0040ea9e2e87ac3446a43f960ee
Merge remote-tracking branch 'upstream/master'

Conflicts:
social_auth/tests/base.py
README.rst
doc/configuration.rst
social_auth/backends/exceptions.py