Merge remote branch 'gitorious/1.0.x' into 1.0.x

author Evan Prodromou <evan@status.net>

Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)
author Evan Prodromou <evan@status.net>
Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)
diff --cc lib/accountsettingsaction.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 5 Oct 2010 18:09:17 +0000 (14:09 -0400)
		1	2
lib/accountsettingsaction.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history