From: Roland Haeder <roland@mxchange.org>
Date: Tue, 26 May 2015 01:12:00 +0000 (+0200)
Subject: Merge branch 'master' into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aa23e565ef6660981d4f5ab65813313aa1cad475;p=quix0rs-gnu-social.git

Merge branch 'master' into social-master

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

Conflicts:
	actions/replies.php
	classes/Notice.php
	lib/noticeform.php
	plugins/WebFinger/WebFingerPlugin.php
---

aa23e565ef6660981d4f5ab65813313aa1cad475