Merge branch 'master' into 0.9.x

author Brion Vibber <brion@status.net>

Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)

committer Brion Vibber <brion@status.net>

Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)
author Brion Vibber <brion@status.net>
Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)
committer Brion Vibber <brion@status.net>
Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)
diff --cc plugins/TwitterBridge/TwitterBridgePlugin.php
Simple merge
author	Brion Vibber <brion@status.net>
	Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)
committer	Brion Vibber <brion@status.net>
	Fri, 19 Nov 2010 23:53:29 +0000 (15:53 -0800)