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

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

51bcfb649fe2a20c9b8b1e66bc59e39da80d326b