From: root <root@diekershoff.homeunix.net>
Date: Sat, 15 Jan 2011 07:54:41 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3323f256c35ceb30a4b2ac1984a2eded672eb33f;p=friendica.git

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

3323f256c35ceb30a4b2ac1984a2eded672eb33f