From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 20 Jan 2016 07:45:42 +0000 (+0100)
Subject: Merge branch 'hotfix_diaspora'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6fa729b0bb274e41dbd065327009659222ae78dd;p=friendica.git

Merge branch 'hotfix_diaspora'
---

6fa729b0bb274e41dbd065327009659222ae78dd