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

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

8d1fb88498d9d4ad9f357ac4a3d0b2f951e776df