From: Silke Meyer <silke@silkemeyer.net>
Date: Tue, 15 Mar 2016 10:18:15 +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=a4dd0b835c90c5dcd611a39354370cb3f860c7d7;p=friendica.git

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

a4dd0b835c90c5dcd611a39354370cb3f860c7d7