From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 29 Jan 2011 08:39:38 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5b35ceefb96f7122f210e2160c45bb4f8b9917b8;p=friendica.git

Merge branch 'friendika-master'
---

5b35ceefb96f7122f210e2160c45bb4f8b9917b8