From: root <root@diekershoff.homeunix.net>
Date: Fri, 21 Jan 2011 11:16:35 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=251727021bfa360886b2e18b09f6d1381686c8e8;p=friendica.git

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

251727021bfa360886b2e18b09f6d1381686c8e8