From: Roland Haeder Date: Tue, 10 Mar 2015 23:18:33 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:social/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e8d1bb25469fe1ef0cbcb32c3022010997aca4b0;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:social/mainline Signed-off-by: Roland Haeder --- e8d1bb25469fe1ef0cbcb32c3022010997aca4b0