Merge branch 'master' into 0.9.x

author Evan Prodromou <evan@status.net>

Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)

committer Evan Prodromou <evan@status.net>

Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)
author Evan Prodromou <evan@status.net>
Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)
committer Evan Prodromou <evan@status.net>
Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)
diff --cc index.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)
committer	Evan Prodromou <evan@status.net>
	Tue, 30 Nov 2010 19:46:26 +0000 (14:46 -0500)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history