From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 12 Feb 2011 17:31:13 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1;p=friendica.git

Merge branch 'friendika-master'
---

53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1