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