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

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

9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21