From: friendica <info@friendica.com>
Date: Mon, 31 Dec 2012 22:54:31 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=405f37b7ae86e61c0f7977d10608d55a2b6acf33;p=friendica.git

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

405f37b7ae86e61c0f7977d10608d55a2b6acf33