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

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

e8897d40795bb771e1ac29264943dd70d371c404