From: Matt Brown <matt@thataddress.com>
Date: Mon, 17 Jan 2011 16:15:30 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e459eec852c083288ba8d6fc260543d750b4aeae;p=django-social-auth.git

Merge remote branch 'upstream/master'
---

e459eec852c083288ba8d6fc260543d750b4aeae