From: Michael Vogel Date: Tue, 2 Feb 2016 20:09:08 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=82d387272c8ccf6bc5c0a312dca4053c541a0ab1;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import --- 82d387272c8ccf6bc5c0a312dca4053c541a0ab1