Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

author Brion Vibber <brion@pobox.com>

Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)

committer Brion Vibber <brion@pobox.com>

Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
author Brion Vibber <brion@pobox.com>
Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
committer Brion Vibber <brion@pobox.com>
Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
diff --cc index.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
committer	Brion Vibber <brion@pobox.com>
	Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history