From: Michael Vogel Date: Tue, 1 Dec 2015 16:16:31 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe900ac5767d58595791c333589de536b0ba8f78;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework --- fe900ac5767d58595791c333589de536b0ba8f78