]> git.parisson.com Git - django-social-auth.git/commitdiff
Merge remote-tracking branch 'upstream/master' into alt-storage
authorSteven Cummings <estebistec@gmail.com>
Fri, 22 Jun 2012 19:24:33 +0000 (14:24 -0500)
committerSteven Cummings <estebistec@gmail.com>
Fri, 22 Jun 2012 19:24:33 +0000 (14:24 -0500)

Trivial merge