From: Michael Vogel Date: Sun, 6 Mar 2016 07:41:24 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=305f6f9a7b22b950f7e1408efc37b0d93d46cfd1;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- 305f6f9a7b22b950f7e1408efc37b0d93d46cfd1