From: root <root@diekershoff.homeunix.net>
Date: Thu, 16 Dec 2010 10:28:51 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=79ab5b2ff87ef171a9baf604179080861d64d788;p=friendica.git

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

79ab5b2ff87ef171a9baf604179080861d64d788