]> git.parisson.com Git - django-social-auth.git/commitdiff
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@internal-rfc1918.hn.nnov.stream.ru>
Mon, 17 Jan 2011 08:45:28 +0000 (11:45 +0300)
committerStas Kravets <skravets@internal-rfc1918.hn.nnov.stream.ru>
Mon, 17 Jan 2011 08:45:28 +0000 (11:45 +0300)
1  2 
example/templates/done.html

Simple merge