From: Silke Meyer <silke@silkemeyer.net>
Date: Wed, 2 Mar 2016 19:45:41 +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=8b524c1b2e5f86b862cf5eedaa7f851747525858;p=friendica.git

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

8b524c1b2e5f86b862cf5eedaa7f851747525858