merge from testing

author Evan Prodromou <evan@status.net>

Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)

committer Evan Prodromou <evan@status.net>

Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)
author Evan Prodromou <evan@status.net>
Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)
committer Evan Prodromou <evan@status.net>
Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)
diff --cc README
Simple merge
diff --cc actions/newnotice.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)
committer	Evan Prodromou <evan@status.net>
	Sat, 31 Oct 2009 18:36:04 +0000 (14:36 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
actions/newnotice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history