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

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

d08b068031f01e1bcf57a46b9e7dfcb217b6fb30