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

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

2413a6b422d5c49024d9c2c9cff79cbc82ba3a56