From: Michael <heluecht@pirati.ca>
Date: Wed, 11 Jan 2017 23:15:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1701-top-level
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12dd06f72677321006e8327636f517a2cb13fc13;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1701-top-level
---

12dd06f72677321006e8327636f517a2cb13fc13