From: Michael Vogel Date: Sat, 30 Jan 2016 15:38:06 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d04e1bdf694207d1fc9d804dd38fa61f134a0255;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import --- d04e1bdf694207d1fc9d804dd38fa61f134a0255