From: friendica <info@friendica.com>
Date: Wed, 16 May 2012 11:59:15 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18f638c93e5dc08c274f404d327ec8f10855a3d3;p=friendica.git

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

18f638c93e5dc08c274f404d327ec8f10855a3d3