From: Michael <heluecht@pirati.ca>
Date: Wed, 15 Mar 2017 14:34:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1701-poco
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f9497f2ca5c9b0ce93607aaf623d9a2120ed90b;p=friendica.git

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

9f9497f2ca5c9b0ce93607aaf623d9a2120ed90b