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

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

ad32d85cfaa775efbd89b273bd51c82f4e45baab