From: Roland Haeder <roland@mxchange.org>
Date: Wed, 21 Dec 2016 18:59:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2178feab30c6bedbf1206b3e1f141a76301ab5fc;p=friendica.git

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

2178feab30c6bedbf1206b3e1f141a76301ab5fc