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

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

9ef5cb1c385e598d16ea78fef7f4207603ea4e79