From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 22 May 2012 09:57:19 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=30f3a16874fd32b55dfbe079afe2470f7ce86e2e;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica
---

30f3a16874fd32b55dfbe079afe2470f7ce86e2e