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

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

f6ee615a79eaab03adc540704ab17b8a44a3d9e8