Merge branch 'testing' into 0.9.x

author Brion Vibber <brion@pobox.com>

Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)

committer Brion Vibber <brion@pobox.com>

Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
author Brion Vibber <brion@pobox.com>
Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
committer Brion Vibber <brion@pobox.com>
Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
diff --cc classes/Notice.php
Simple merge
diff --cc lib/activity.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
committer	Brion Vibber <brion@pobox.com>
	Thu, 29 Apr 2010 22:14:51 +0000 (15:14 -0700)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/activity.php	patch \|	diff1 \|	diff2 \|	blob \| history