From: rebeka-catalina <github@rct.in-berlin.de>
Date: Sat, 8 Apr 2017 09:42:20 +0000 (+0200)
Subject: Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=291906de5f3074407253241e5ccbb5af633e0c22;p=friendica.git

Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop
---

291906de5f3074407253241e5ccbb5af633e0c22