From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 31 May 2011 05:36:25 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=745d075397941e0a84d017342bb9c4c4a4c1ef5b;p=friendica.git

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

745d075397941e0a84d017342bb9c4c4a4c1ef5b