Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

author Zach Copley <zach@status.net>

Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)

committer Zach Copley <zach@status.net>

Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)
author Zach Copley <zach@status.net>
Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)
committer Zach Copley <zach@status.net>
Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)
diff --cc plugins/TwitterBridge/twitterauthorization.php
Simple merge
author	Zach Copley <zach@status.net>
	Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)
committer	Zach Copley <zach@status.net>
	Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)