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

1  2 
README.rst
doc/configuration.rst
social_auth/backends/exceptions.py

diff --cc README.rst
Simple merge
Simple merge
Simple merge