From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 8 Nov 2015 11:37:17 +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=5605bb6101c653421cd61c9f3e56549a6bcadc52;p=friendica.git

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

5605bb6101c653421cd61c9f3e56549a6bcadc52