From: friendica <info@friendica.com>
Date: Thu, 8 Mar 2012 22:35:47 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b47626c15dbe5cb54f0e8711a6e35d0500d78de;p=friendica.git

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

3b47626c15dbe5cb54f0e8711a6e35d0500d78de