Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)

committer Brion Vibber <brion@pobox.com>

Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)
author Brion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)
committer Brion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)
diff --cc EVENTS.txt
Simple merge
diff --cc README
Simple merge
diff --cc lib/apiaction.php
Simple merge
diff --cc lib/common.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 16 Aug 2010 23:56:27 +0000 (16:56 -0700)
		1	2
EVENTS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history