From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 9 Jun 2011 08:20:47 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ffd0ee41a70d30cadf18032f655222911304b7c;p=friendica.git

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

7ffd0ee41a70d30cadf18032f655222911304b7c