From: root <root@diekershoff.homeunix.net>
Date: Tue, 4 Jan 2011 13:21:43 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cbace1639e7eb9c543a2ba0b51619a7f4164ae64;p=friendica.git

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

cbace1639e7eb9c543a2ba0b51619a7f4164ae64