From: friendica <info@friendica.com>
Date: Sun, 8 Jul 2012 04:55:15 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=63f10f6c6bb1ce794643b7511ab50cd810b79595;p=friendica.git

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

63f10f6c6bb1ce794643b7511ab50cd810b79595