From: root <root@diekershoff.homeunix.net>
Date: Wed, 15 Dec 2010 11:07:14 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=961a0c13c7fb257f356b9a67b1b0f3dd32bfc80c;p=friendica.git

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

961a0c13c7fb257f356b9a67b1b0f3dd32bfc80c