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

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

dacda667d9961d52213ced563504f6e7f7c9325b