From: Stas Kravets <skravets@applebough.(none)>
Date: Tue, 1 Feb 2011 10:44:39 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=024761af524c554497becd2643cf979697b32592;p=django-social-auth.git

Merge remote branch 'upstream/master'

Conflicts:
	social_auth/backends/contrib/livejournal.py
---

024761af524c554497becd2643cf979697b32592