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

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

abf976bb36503268d810b7733407caaf3351dca2