From: Michael Vogel Date: Mon, 11 Jan 2016 13:25:48 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=01c2eacd4624a3305c9a4a68ce3aa57f23abf11c;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total --- 01c2eacd4624a3305c9a4a68ce3aa57f23abf11c