From: Roland Haeder <roland@mxchange.org>
Date: Sun, 8 Mar 2015 23:36:00 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0b54b9b6438c6c2ef7394df17557004da151785;p=quix0rs-gnu-social.git

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
	plugins/OStatus/OStatusPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

f0b54b9b6438c6c2ef7394df17557004da151785