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

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

c000510c2737e66a4504d90ca31a673d84ce90f7