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

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

fa90f27b53e8c255d048797f31bbce789e7e8d22