From: root <root@diekershoff.homeunix.net>
Date: Thu, 6 Jan 2011 07:37:44 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=05708c9a8d6f6a1cbd29a208f1372403fcff2058;p=friendica.git

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

05708c9a8d6f6a1cbd29a208f1372403fcff2058