From: root <root@diekershoff.homeunix.net>
Date: Fri, 24 Dec 2010 10:19:31 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6f8c4169e57188093b3d2ce6d0e66f1364b5a5fb;p=friendica.git

Merge branch 'master' of git://github.com/friendika/friendika
---

6f8c4169e57188093b3d2ce6d0e66f1364b5a5fb