From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 16 Jun 2011 00:09:29 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d;p=friendica.git

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

ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d