From: root <root@diekershoff.homeunix.net>
Date: Wed, 5 Jan 2011 06:37:01 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=830a56723c37e206f2114c4bc4ade080f475cba9;p=friendica.git

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

830a56723c37e206f2114c4bc4ade080f475cba9