From: friendica <info@friendica.com>
Date: Thu, 29 Nov 2012 03:25:47 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d972ccc408c8c5ab06fc8ce31714ad91a6d94802;p=friendica.git

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

d972ccc408c8c5ab06fc8ce31714ad91a6d94802