From: friendica <info@friendica.com>
Date: Mon, 17 Dec 2012 01:59:15 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f1592547e7a6e3a474ecc20c63b8e3add47a8b4;p=friendica.git

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

0f1592547e7a6e3a474ecc20c63b8e3add47a8b4