From: friendica <info@friendica.com>
Date: Wed, 11 Apr 2012 03:51:04 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=967ed8e23f90e12963ce1d7e3e045c258c549835;p=friendica.git

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

967ed8e23f90e12963ce1d7e3e045c258c549835