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

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

9a30055aae1f64201b45a1a052e98471f3d99094