]> git.parisson.com Git - django-social-auth.git/commitdiff
Merge remote branch 'upstream/master'
authorMatt Brown <matt@thataddress.com>
Mon, 17 Jan 2011 16:15:30 +0000 (11:15 -0500)
committerMatt Brown <matt@thataddress.com>
Mon, 17 Jan 2011 16:15:30 +0000 (11:15 -0500)
1  2 
social_auth/backends.py
social_auth/conf.py

Simple merge
Simple merge