From: friendica <info@friendica.com>
Date: Sun, 11 Nov 2012 21:58:17 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b75ca0d5b8c63ee86e97b4a32831fe03fe2b8fa3;p=friendica.git

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

b75ca0d5b8c63ee86e97b4a32831fe03fe2b8fa3