From: Stas Kravets <krvss@mail.ru>
Date: Fri, 13 Apr 2012 14:42:33 +0000 (+0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=772903287355b5ef88046c559bda23858120e887;p=django-social-auth.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	social_auth/tests/base.py
---

772903287355b5ef88046c559bda23858120e887