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

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

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

ca5b6aa280564f35fc90ec1ebbdfee1d650c9229