From: Evan Prodromou <evan@status.net>
Date: Wed, 22 Sep 2010 14:45:34 +0000 (-0400)
Subject: Merge branch '0.9.x' into activityexport
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b5cfcba4712809cb17eabba299ce5ff04f4d7d70;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into activityexport

Conflicts:
	plugins/OStatus/OStatusPlugin.php
---

b5cfcba4712809cb17eabba299ce5ff04f4d7d70