Merge remote branch 'gitorious/0.9.x' into 0.9.x

author Evan Prodromou <evan@status.net>

Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)
author Evan Prodromou <evan@status.net>
Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)
diff --cc plugins/TwitterBridge/daemons/twitterstatusfetcher.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)