From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 08:48:07 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4cd3d5cd0247cb758fd24521b46540c60076af56;p=friendica.git

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

4cd3d5cd0247cb758fd24521b46540c60076af56