From: friendica <info@friendica.com>
Date: Fri, 4 Jan 2013 23:14:33 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8209ae6455b270dfe7d5c95ae6be00d60310d236;p=friendica.git

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

8209ae6455b270dfe7d5c95ae6be00d60310d236