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

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

c472799b8dd607946c0bf787240ba4df7fd28e93