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

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

21bc6982acc78ca44fc6babf9654c619e8dee0e5