From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 22 Dec 2015 09:50:52 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f76c3dd41d4533c32c43767d0836dae9597d588;p=friendica.git

Merge branch 'master' into develop
---

7f76c3dd41d4533c32c43767d0836dae9597d588