From: Michael Vogel Date: Sun, 24 Jan 2016 07:18:38 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1471385157866b1deabe69dd6678dac220afd90e;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn --- 1471385157866b1deabe69dd6678dac220afd90e