Merge branch 'righttoleave' into 0.9.x

author Evan Prodromou <evan@status.net>

Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)

committer Evan Prodromou <evan@status.net>

Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)
author Evan Prodromou <evan@status.net>
Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)
committer Evan Prodromou <evan@status.net>
Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)
diff --cc classes/Notice.php
Simple merge
diff --cc classes/Profile.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)
committer	Evan Prodromou <evan@status.net>
	Wed, 22 Dec 2010 19:22:51 +0000 (11:22 -0800)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history