From: friendica <info@friendica.com>
Date: Tue, 4 Sep 2012 04:32:47 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5beda888b864ead8078047e35478d35f5108df6f;p=friendica.git

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

5beda888b864ead8078047e35478d35f5108df6f