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