From: friendica <info@friendica.com>
Date: Sun, 7 Oct 2012 22:29:13 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6df274006c108c6a0c33b2ea57e076ab9a360570;p=friendica.git

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

6df274006c108c6a0c33b2ea57e076ab9a360570