From: friendica <info@friendica.com>
Date: Wed, 25 Jul 2012 00:25:36 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00043f3f1e3034e6cb4c12426ac57e90290e3622;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

00043f3f1e3034e6cb4c12426ac57e90290e3622