From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 26 Dec 2014 10:00:01 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d87323c2bb54cd7e9b17a15e9926609ee07dc345;p=friendica.git

Merge branch 'master' into develop
---

d87323c2bb54cd7e9b17a15e9926609ee07dc345