Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)

committer Brion Vibber <brion@pobox.com>

Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)
author Brion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)
committer Brion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)
diff --cc actions/shownotice.php
Simple merge
diff --cc actions/showstream.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 4 Oct 2010 20:06:40 +0000 (13:06 -0700)
		1	2
actions/shownotice.php	patch \|	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	patch \|	diff1 \|	diff2 \|	blob \| history