From: Michael Vogel Date: Wed, 2 Mar 2016 10:59:13 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f7f964bb7200d4f658742a999c07f1dd6cbe97c;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- 1f7f964bb7200d4f658742a999c07f1dd6cbe97c