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

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

5c033dee773ff0b8c94b7d741c4cb89f0f776252