From: friendica <info@friendica.com>
Date: Wed, 5 Sep 2012 05:53:32 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=411b6a71b458a8654acf375fba22d48e3d9fc1bf;p=friendica.git

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

411b6a71b458a8654acf375fba22d48e3d9fc1bf