From: friendica <info@friendica.com>
Date: Sun, 5 Aug 2012 06:30:35 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f616fd21e7183e644c10e162288f473afc4681e7;p=friendica.git

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

f616fd21e7183e644c10e162288f473afc4681e7