From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 22 Mar 2011 05:50:47 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=767b4f30f7ee114b1cfd66e68fa959ac033b5667;p=friendica.git

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

767b4f30f7ee114b1cfd66e68fa959ac033b5667