Merge branch 'swat0' into 0.9.x

author Evan Prodromou <evan@status.net>

Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -0400)

committer Evan Prodromou <evan@status.net>

Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -0400)
author Evan Prodromou <evan@status.net>
Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -0400)
committer Evan Prodromou <evan@status.net>
Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -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>
	Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -0400)
committer	Evan Prodromou <evan@status.net>
	Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -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