From: Fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 6 Jul 2015 14:56:49 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=95945ecae630e5990da5aef5837eb74c96904e33;hp=-c;p=friendica.git

Merge branch 'master' into develop
---

95945ecae630e5990da5aef5837eb74c96904e33