Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)

committer Brion Vibber <brion@pobox.com>

Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)
author Brion Vibber <brion@pobox.com>
Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)
committer Brion Vibber <brion@pobox.com>
Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)
diff --cc EVENTS.txt
Simple merge
diff --cc classes/Notice.php
Simple merge
diff --cc classes/Profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)
committer	Brion Vibber <brion@pobox.com>
	Tue, 28 Dec 2010 19:38:34 +0000 (11:38 -0800)
		1	2
EVENTS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history