From: Sebastian Egbers <sebastian@egbers.info>
Date: Mon, 25 Jun 2012 11:59:39 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=020deedd7c68ce016b65056062d85567c91c3d37;p=friendica.git

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

020deedd7c68ce016b65056062d85567c91c3d37