From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 23 Feb 2012 13:10:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6a0c815c1f8855c59f80c0de63095a35ed002cb4;p=friendica.git

Merge remote-tracking branch 'friendica/master'
---

6a0c815c1f8855c59f80c0de63095a35ed002cb4