From: Michael Vogel <icarus@dabo.de>
Date: Tue, 27 Jan 2015 09:20:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6a3421035387557ac52310aa66479b5667e92547;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
---

6a3421035387557ac52310aa66479b5667e92547