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

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

6f9fd92c2eabd1b26182e2f7157f35e44f94dc67