From: friendica <info@friendica.com>
Date: Tue, 8 May 2012 08:15:19 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da4a360a6ebef8188aa9125b6911b88d7eb9e609;p=friendica.git

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

da4a360a6ebef8188aa9125b6911b88d7eb9e609