From: friendica <info@friendica.com>
Date: Mon, 15 Oct 2012 00:16:41 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3af16ff92a6ee3c56986d4d9f79fff3b2d61ca26;p=friendica.git

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

3af16ff92a6ee3c56986d4d9f79fff3b2d61ca26