From: Roland Haeder <roland@mxchange.org>
Date: Fri, 27 Mar 2015 15:37:12 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c9dbff374187f8e7f5759528eb852355853868f0;p=quix0rs-gnu-social.git

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

Conflicts:
	INSTALL

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

c9dbff374187f8e7f5759528eb852355853868f0