From: Roland Häder Date: Fri, 16 Jan 2015 10:54:27 +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=c909f351d07c50c433cd59fef00f41a67767ce9e;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:social/mainline into social-master Signed-off-by: Roland Häder --- c909f351d07c50c433cd59fef00f41a67767ce9e