Merge branch '0.9.x' into facebook-upgrade

author Zach Copley <zach@status.net>

Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)

committer Zach Copley <zach@status.net>

Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)
author Zach Copley <zach@status.net>
Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)
committer Zach Copley <zach@status.net>
Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)
diff --cc EVENTS.txt
Simple merge
diff --cc lib/util.php
Simple merge
author	Zach Copley <zach@status.net>
	Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)
committer	Zach Copley <zach@status.net>
	Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)
		1	2
EVENTS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history