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

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

8b997791819ba419e7e2ceb7861bb0e3e37d87dd