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

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

a8b9b219158e8565af615b852c587787ad58a0a3