From: friendica <info@friendica.com>
Date: Wed, 2 Jan 2013 01:33:33 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9bb9350126f6d954a1596a67ae34aee0d4c83d34;p=friendica.git

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

9bb9350126f6d954a1596a67ae34aee0d4c83d34