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

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

dbf6ee6a0578a0b4244852b74dac549a25e6f05d