Merge remote-tracking branch 'upstream/master'

author Stas Kravets <krvss@mail.ru>

Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)

committer Stas Kravets <krvss@mail.ru>

Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)
author Stas Kravets <krvss@mail.ru>
Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)
committer Stas Kravets <krvss@mail.ru>
Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)
diff --cc README.rst
Simple merge
diff --cc example/settings.py
Simple merge
diff --cc social_auth/backends/__init__.py
Simple merge
author	Stas Kravets <krvss@mail.ru>
	Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)
committer	Stas Kravets <krvss@mail.ru>
	Wed, 4 Jan 2012 09:31:30 +0000 (13:31 +0400)
		1	2
README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
example/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
social_auth/backends/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history