From: rebeka-catalina <github@rct.in-berlin.de>
Date: Sat, 8 Apr 2017 12:50:45 +0000 (+0200)
Subject: Merge branch 'develop' of git://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fa76ec4e33be77380bc42bc8e1836bee400318fd;p=friendica.git

Merge branch 'develop' of git://github.com/friendica/friendica into develop
---

fa76ec4e33be77380bc42bc8e1836bee400318fd