From: Roland Häder Date: Fri, 16 Jan 2015 11:58:23 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:social/mainline into social-master X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b92ef93d36947e64da2e2078531848539d18bfea;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:social/mainline into social-master Signed-off-by: Roland Häder --- b92ef93d36947e64da2e2078531848539d18bfea