From: Michael Vogel Date: Mon, 20 Jun 2016 22:10:24 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1606-contact-id X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=266fea3874f99b0c3825942cb3a7096ff2737ea0;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1606-contact-id --- 266fea3874f99b0c3825942cb3a7096ff2737ea0