From: Michael Vogel <icarus@dabo.de>
Date: Mon, 9 Feb 2015 09:16:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=21c63e8b650ff599ca48c94c01c6583dc88f96f3;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
---

21c63e8b650ff599ca48c94c01c6583dc88f96f3