Merge branch '0.9.x' into location

author Evan Prodromou <evan@status.net>

Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)

committer Evan Prodromou <evan@status.net>

Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)
author Evan Prodromou <evan@status.net>
Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)
committer Evan Prodromou <evan@status.net>
Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)
diff --cc classes/Notice.php
Simple merge
diff --cc classes/User.php
Simple merge
diff --cc lib/default.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)
committer	Evan Prodromou <evan@status.net>
	Wed, 28 Oct 2009 21:24:53 +0000 (17:24 -0400)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/default.php	patch \|	diff1 \|	diff2 \|	blob \| history