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

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

98db8bc015970ce2ca03d53c710aaa8cf40cce87