From: root <root@diekershoff.homeunix.net>
Date: Mon, 10 Jan 2011 07:17:01 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b500f7ffac6214dd07ec315a52ec06455cce435f;p=friendica.git

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

b500f7ffac6214dd07ec315a52ec06455cce435f