From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 2 Feb 2011 07:00:50 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a3fd84661f74b0759f9edad1f068b32820b03c5d;p=friendica.git

Merge branch 'friendika-master'
---

a3fd84661f74b0759f9edad1f068b32820b03c5d