From: Silke Meyer <silke@silkemeyer.net>
Date: Fri, 17 Jun 2016 16:36:38 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e2f8673076165c402782332b42ee744b1ffc7969;p=friendica.git

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

e2f8673076165c402782332b42ee744b1ffc7969