Merge branch '0.8.x' into 0.9.x

author Evan Prodromou <evan@status.net>

Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)
author Evan Prodromou <evan@status.net>
Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)
diff --cc actions/editgroup.php
Simple merge
diff --cc lib/twitterapi.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 29 Sep 2009 22:03:10 +0000 (18:03 -0400)
		1	2
actions/editgroup.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/twitterapi.php	patch \|	diff1 \|	diff2 \|	blob \| history