From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 May 2011 04:19:59 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=087f79236e79975d482f739e84cc16f6648e1bec;p=friendica.git

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

087f79236e79975d482f739e84cc16f6648e1bec