From: root <root@diekershoff.homeunix.net>
Date: Thu, 23 Dec 2010 06:39:23 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a1d593613d737d6f1a694adaddf515187580105c;p=friendica.git

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

a1d593613d737d6f1a694adaddf515187580105c