Merge branch 'testing' into 0.9.x

author Brion Vibber <brion@pobox.com>

Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)

committer Brion Vibber <brion@pobox.com>

Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)
author Brion Vibber <brion@pobox.com>
Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)
committer Brion Vibber <brion@pobox.com>
Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)
diff --cc lib/action.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)
committer	Brion Vibber <brion@pobox.com>
	Wed, 10 Mar 2010 17:55:14 +0000 (09:55 -0800)
		1	2
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history