From: Michael Vogel <icarus@dabo.de>
Date: Thu, 7 Jul 2016 21:35:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db1d8caaf296547158df4198121d24ed4589b19c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
---

db1d8caaf296547158df4198121d24ed4589b19c