Merge remote branch 'upstream/master'

author Stas Kravets <skravets@applebough.(none)>

Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)

committer Stas Kravets <skravets@applebough.(none)>

Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)
author Stas Kravets <skravets@applebough.(none)>
Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)
committer Stas Kravets <skravets@applebough.(none)>
Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)
diff --cc setup.py
Simple merge
diff --cc social_auth/backends/__init__.py
Simple merge
author	Stas Kravets <skravets@applebough.(none)>
	Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)
committer	Stas Kravets <skravets@applebough.(none)>
	Mon, 4 Apr 2011 07:54:12 +0000 (11:54 +0400)
		1	2
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history
social_auth/backends/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history