Merge commit 'origin/testing' into 0.9.x

author Brion Vibber <brion@pobox.com>

Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)

committer Brion Vibber <brion@pobox.com>

Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)
author Brion Vibber <brion@pobox.com>
Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)
committer Brion Vibber <brion@pobox.com>
Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)
diff --cc js/util.js
Simple merge
diff --cc lib/default.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)
committer	Brion Vibber <brion@pobox.com>
	Fri, 22 Jan 2010 00:33:11 +0000 (16:33 -0800)
		1	2
js/util.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/default.php	patch \|	diff1 \|	diff2 \|	blob \| history