From: friendica <info@friendica.com>
Date: Tue, 23 Oct 2012 10:29:50 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e757f3cb5339e5dd5ac60f95f55f06dd9be3bf22;p=friendica.git

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

e757f3cb5339e5dd5ac60f95f55f06dd9be3bf22