From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Mar 2017 08:49:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1701-poco
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83e5c31d2823e5c46d062b0ec38afabda5199a0c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1701-poco
---

83e5c31d2823e5c46d062b0ec38afabda5199a0c