From: friendica <info@friendica.com>
Date: Fri, 9 Nov 2012 00:32:25 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=083d660f615563c99d26d7ead29409afac0ba8ba;p=friendica.git

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

083d660f615563c99d26d7ead29409afac0ba8ba