From: Michael Vogel Date: Wed, 3 Feb 2016 07:34:11 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d9b5d6d5f55bd01dff0f54a2e0d1f086b20851c7;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import --- d9b5d6d5f55bd01dff0f54a2e0d1f086b20851c7