From: Michael Vogel <icarus@dabo.de>
Date: Sat, 13 Feb 2016 19:12:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9261154eaba403d13e2dcc18aa5d3cc09aa60deb;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
---

9261154eaba403d13e2dcc18aa5d3cc09aa60deb