From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 00:16:13 +0000 (-0700)
Subject: Merge branch '1.0.x' into schema-x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99194e03fa50b61f99164674afc949b4bbefd44a;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
---

99194e03fa50b61f99164674afc949b4bbefd44a