From: Michael Vogel Date: Sat, 23 Jan 2016 17:50:14 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=737131837623b3f3870a84027202979fee6e3224;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn --- 737131837623b3f3870a84027202979fee6e3224