From: friendica <info@friendica.com>
Date: Mon, 2 Jul 2012 08:13:30 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5;p=friendica.git

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

64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5