From: root <root@diekershoff.homeunix.net>
Date: Wed, 22 Dec 2010 05:37:33 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=780ab072f55bd18575ca821eb6ea481cc0728814;p=friendica.git

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

780ab072f55bd18575ca821eb6ea481cc0728814