]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Mon, 14 Feb 2011 08:54:58 +0000 (11:54 +0300)
committerStas Kravets <skravets@applebough.(none)>
Mon, 14 Feb 2011 08:54:58 +0000 (11:54 +0300)
commit0577db6d68c6d3ff1a02bac0653fec8fd14e1040
tree264c58767e092008a18b97458c152263e666a642
parent024761af524c554497becd2643cf979697b32592
parentdc4cfc8b6aa947562194d4aa43724b869890c66c
Merge remote branch 'upstream/master'

Conflicts:
example/app/views.py
example/app/views.py
example/local_settings.py.template