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

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

96c47a6577a5b164f164b4873011069c3a614b77