Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)

committer Brion Vibber <brion@pobox.com>

Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)
author Brion Vibber <brion@pobox.com>
Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)
committer Brion Vibber <brion@pobox.com>
Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)
diff --cc README
Simple merge
diff --cc lib/common.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)
committer	Brion Vibber <brion@pobox.com>
	Tue, 19 Oct 2010 22:18:07 +0000 (15:18 -0700)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history