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

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

a96da925712184eec97f6ca01072b7c2bee92a7e