From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 28 Jan 2013 06:00:07 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5c3bce30d65ad219030a84e57f3336cc69f21ead;p=friendica.git

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

5c3bce30d65ad219030a84e57f3336cc69f21ead