From: gerhard6380 <gerhard@seeber.at>
Date: Fri, 23 Sep 2016 17:34:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c0aac548274d463c611a9c0317fa6ec7d205a30e;p=friendica.git

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

c0aac548274d463c611a9c0317fa6ec7d205a30e