From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 17:06:52 +0000 (-0700)
Subject: Merge branch 'testing'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b77c029aa811e08027d6dc8ed7d46be397eb6fb3;p=quix0rs-gnu-social.git

Merge branch 'testing'

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

b77c029aa811e08027d6dc8ed7d46be397eb6fb3