From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 30 Sep 2011 12:31:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendika/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60e0f79b9f9e94b19cc412eac41e5d8f8fec2383;p=friendica.git

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

60e0f79b9f9e94b19cc412eac41e5d8f8fec2383