From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 18 Mar 2011 17:07:37 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=878bdeccfd66b7b8229fd761c23ba13bc51c7454;p=friendica.git

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

878bdeccfd66b7b8229fd761c23ba13bc51c7454