From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 5 Feb 2011 08:19:03 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0c83fb4d807d2cdf78acc4bd206bc7b278b01f53;p=friendica.git

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

0c83fb4d807d2cdf78acc4bd206bc7b278b01f53