From: Roland Haeder <roland@mxchange.org>
Date: Sat, 7 Mar 2015 18:31:47 +0000 (+0100)
Subject: Merge branch 'social-master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aa4f00a0681539d3f289b3989a10e3e625931df6;p=quix0rs-gnu-social.git

Merge branch 'social-master' into nightly

Conflicts:
	lib/noticeform.php

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

aa4f00a0681539d3f289b3989a10e3e625931df6