From: root <root@diekershoff.homeunix.net>
Date: Mon, 24 Jan 2011 06:44:08 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9;p=friendica.git

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

80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9