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

author Evan Prodromou <evan@status.net>

Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)

committer Evan Prodromou <evan@status.net>

Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)
author Evan Prodromou <evan@status.net>
Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)
committer Evan Prodromou <evan@status.net>
Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)
diff --cc lib/htmloutputter.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)
committer	Evan Prodromou <evan@status.net>
	Mon, 26 Apr 2010 06:43:33 +0000 (02:43 -0400)
		1	2
lib/htmloutputter.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history