From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 26 May 2011 06:20:27 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5e01432c6f15714370f3fd4f07eaf35615052955;p=friendica.git

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

5e01432c6f15714370f3fd4f07eaf35615052955