From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 10 Jun 2011 05:02:53 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8390e8b19bf1797c8751c0d5c625a42c26dfc4eb;p=friendica.git

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

8390e8b19bf1797c8751c0d5c625a42c26dfc4eb