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

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

31d447126aefbe1bdb14ed5a4a6b7d84845e9f29