From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 21 May 2015 06:40:08 +0000 (+0200)
Subject: Merge pull request #1584 from fabrixxm/develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b75cd177a7e3f2033aea76d006b80372d70ca19d;p=friendica.git

Merge pull request #1584 from fabrixxm/develop

merge "master" back in develop
---

b75cd177a7e3f2033aea76d006b80372d70ca19d