Merge branch 'json-activities' into 0.9.x

author Zach Copley <zach@status.net>

Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)

committer Zach Copley <zach@status.net>

Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)
author Zach Copley <zach@status.net>
Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)
committer Zach Copley <zach@status.net>
Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)
diff --cc classes/Notice.php
Simple merge
diff --cc classes/Profile.php
Simple merge
author	Zach Copley <zach@status.net>
	Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)
committer	Zach Copley <zach@status.net>
	Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history