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

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

8fbde780b37e3d5eeb2ee672a3474b3701eb9645