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

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

d8f9458663f3a8212e98c1d781a06fc22c34e3a2