From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 24 Jan 2011 06:33:56 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4198efe03570606b35f3aba6cdf7f80de20384f4;p=friendica.git

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

4198efe03570606b35f3aba6cdf7f80de20384f4