From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 5 Jun 2011 02:59:13 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e8b2092a0c30a8eb898a8f0e7130251300e8d47;p=friendica.git

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

0e8b2092a0c30a8eb898a8f0e7130251300e8d47