Merge branch 'master' into 0.9.x

author Brion Vibber <brion@pobox.com>

Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)

committer Brion Vibber <brion@pobox.com>

Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)
author Brion Vibber <brion@pobox.com>
Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)
committer Brion Vibber <brion@pobox.com>
Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)
diff --cc lib/common.php
Simple merge
diff --cc plugins/Facebook/FBConnectAuth.php
Simple merge
diff --cc plugins/OpenID/finishopenidlogin.php
Simple merge
diff --cc plugins/TwitterBridge/twitterauthorization.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)
committer	Brion Vibber <brion@pobox.com>
	Thu, 20 Jan 2011 23:08:31 +0000 (15:08 -0800)
		1	2
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/Facebook/FBConnectAuth.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/finishopenidlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/twitterauthorization.php	patch \|	diff1 \|	diff2 \|	blob \| history