From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 12:48:41 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=03563ca35a0c40224e3159c664c596691078df90;p=friendica.git

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

03563ca35a0c40224e3159c664c596691078df90