From: root <root@diekershoff.homeunix.net>
Date: Fri, 14 Jan 2011 06:15:57 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=30551b24ec833ef58e98071e56cb3bb94f302dd3;p=friendica.git

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

30551b24ec833ef58e98071e56cb3bb94f302dd3