From: Michael Vogel Date: Sun, 29 Nov 2015 16:05:40 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ca47c1c4dfca561d7b662b6427f55dabc51afa6d;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution --- ca47c1c4dfca561d7b662b6427f55dabc51afa6d