From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 23 Jul 2011 05:43:25 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=abc01cad20f599a205e5c2534936092f6820e702;p=friendica.git

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

abc01cad20f599a205e5c2534936092f6820e702