From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 10 Jun 2011 17:14:10 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb6666e1563cef91843539d3b98dc4936c4cea1f;p=friendica.git

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

eb6666e1563cef91843539d3b98dc4936c4cea1f