From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 25 Jan 2011 07:53:39 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bb1afd867d1b7bd98930108727b88a066af9749d;p=friendica.git

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

bb1afd867d1b7bd98930108727b88a066af9749d