Merge branch '0.8.x' into 0.9.x

author Evan Prodromou <evan@status.net>

Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)

committer Evan Prodromou <evan@status.net>

Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
author Evan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
committer Evan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
diff --cc classes/Notice.php
Simple merge
diff --cc lib/action.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
committer	Evan Prodromou <evan@status.net>
	Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history