From: friendica <info@friendica.com>
Date: Mon, 26 Nov 2012 03:21:24 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15ede093cf6dc61b306d43c7fce99c1336623c56;p=friendica.git

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

15ede093cf6dc61b306d43c7fce99c1336623c56