From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Jan 2011 20:33:08 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2319bc43bf3f837c22daa5067dcf538e8b5a792d;p=friendica.git

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

2319bc43bf3f837c22daa5067dcf538e8b5a792d