From: Michael Vogel Date: Sat, 12 Mar 2016 06:38:25 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0aeea4a89e26f21125f52b4a8657ca93f2a1f80;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- a0aeea4a89e26f21125f52b4a8657ca93f2a1f80