From: gerhard6380 <gerhard@seeber.at>
Date: Thu, 22 Sep 2016 19:59:51 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7c9a0ec4594fa6d45cc615f8bde914bcc131226d;p=friendica.git

Merge branch 'master'
---

7c9a0ec4594fa6d45cc615f8bde914bcc131226d