From: Michael Vogel Date: Wed, 27 Jan 2016 12:16:28 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aeecd83ade8dfea9565c30da329879a681b0fd4b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import --- aeecd83ade8dfea9565c30da329879a681b0fd4b