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

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

3208d6afcbcf6e74ca5d0ac30be1559327e00bf9