Merge branch 'master' into 0.9.x

author Evan Prodromou <evan@status.net>

Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)

committer Evan Prodromou <evan@status.net>

Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)
author Evan Prodromou <evan@status.net>
Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)
committer Evan Prodromou <evan@status.net>
Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)
diff --cc classes/File.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)
committer	Evan Prodromou <evan@status.net>
	Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)
		1	2
classes/File.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history