Merge branch '0.9.x' into activityexport

author Evan Prodromou <evan@status.net>

Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)

committer Evan Prodromou <evan@status.net>

Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
author Evan Prodromou <evan@status.net>
Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
committer Evan Prodromou <evan@status.net>
Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
diff --cc classes/Notice.php
Simple merge
diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
committer	Evan Prodromou <evan@status.net>
	Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/OStatusPlugin.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history