Merge remote branch 'upstream/master'

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

Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)

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

Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)
author Stas Kravets <skravets@applebough.(none)>
Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)
committer Stas Kravets <skravets@applebough.(none)>
Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)
diff --cc example/app/views.py
Simple merge
diff --cc example/templates/done.html
Simple merge
diff --cc social_auth/backends/__init__.py
Simple merge
author	Stas Kravets <skravets@applebough.(none)>
	Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)
committer	Stas Kravets <skravets@applebough.(none)>
	Fri, 10 Jun 2011 16:14:10 +0000 (20:14 +0400)
		1	2
example/app/views.py	patch \|	diff1 \|	diff2 \|	blob \| history
example/templates/done.html	patch \|	diff1 \|	diff2 \|	blob \| history
social_auth/backends/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history