From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 14 Sep 2012 13:36:15 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8d0293e9eae8a322121e731112d5b891b107290;p=friendica.git

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

c8d0293e9eae8a322121e731112d5b891b107290