Merge branch '0.9.x' into 1.0.x

author Evan Prodromou <evan@status.net>

Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)

committer Evan Prodromou <evan@status.net>

Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)
author Evan Prodromou <evan@status.net>
Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)
committer Evan Prodromou <evan@status.net>
Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)
diff --cc README
Simple merge
diff --cc index.php
Simple merge
diff --cc theme/default/css/display.css
Simple merge
diff --cc theme/identica/css/display.css
Simple merge
author	Evan Prodromou <evan@status.net>
	Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)
committer	Evan Prodromou <evan@status.net>
	Mon, 6 Sep 2010 14:12:17 +0000 (10:12 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/default/css/display.css	patch \|	diff1 \|	diff2 \|	blob \| history
theme/identica/css/display.css	patch \|	diff1 \|	diff2 \|	blob \| history