From: Roland Haeder <roland@mxchange.org>
Date: Thu, 5 Mar 2015 21:04:51 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=201ec889166536f92b55df568b0ff944d0db000b;p=quix0rs-gnu-social.git

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

Conflicts:
	README.md

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

201ec889166536f92b55df568b0ff944d0db000b