From: friendica <info@friendica.com>
Date: Tue, 17 Jul 2012 00:04:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=884454f7edd925190c50b7503b30354063242b70;p=friendica.git

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

884454f7edd925190c50b7503b30354063242b70