From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 8 Nov 2015 15:04:50 +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=808eaa633a784c094dd5c2b79f541c911bec782e;p=friendica.git

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

808eaa633a784c094dd5c2b79f541c911bec782e