From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 2 Jan 2013 10:10:59 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=68d304cc0f60d5dd16d8c5930b87b288c5183437;p=friendica.git

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

68d304cc0f60d5dd16d8c5930b87b288c5183437