From: Stas Kravets <skravets@applebough.(none)>
Date: Fri, 25 Mar 2011 10:00:49 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f7f286c92868b873001aeb0475b9b327e112f9c9;p=django-social-auth.git

Merge remote branch 'upstream/master'

Conflicts:
	setup.py
---

f7f286c92868b873001aeb0475b9b327e112f9c9