From: root <root@diekershoff.homeunix.net>
Date: Thu, 6 Jan 2011 21:20:16 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a60291222c0ebb1e0d181cc1d597e9218c2621b;p=friendica.git

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

1a60291222c0ebb1e0d181cc1d597e9218c2621b