From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 10 Nov 2015 19:10:20 +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=76adcdc031ffa9657fe8352c108697680bdcf44b;p=friendica.git

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

76adcdc031ffa9657fe8352c108697680bdcf44b