From: Michael Vogel Date: Tue, 17 Feb 2015 18:18:17 +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=a26d04574dc402adfb501f222cc824161aece9ea;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape --- a26d04574dc402adfb501f222cc824161aece9ea