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

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

e036434b8a2dbd8594c0ac5ac7233f4700e4e475