From: Silke Meyer <silke@silkemeyer.net>
Date: Sat, 12 Nov 2016 09:05:46 +0000 (+0100)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7886de5c393591eaf4e05f2a496a4f40060cb262;p=friendica.git

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

7886de5c393591eaf4e05f2a496a4f40060cb262