From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 3 Jan 2011 08:45:13 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43283fd35fb9987a1554612220f11a0875697bd4;p=friendica.git

Merge branch 'friendika-master'
---

43283fd35fb9987a1554612220f11a0875697bd4