From: friendica <info@friendica.com>
Date: Wed, 6 Jun 2012 00:59:49 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae08d2c49b042780d87e17b73d8bb7c4b99263da;p=friendica.git

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

ae08d2c49b042780d87e17b73d8bb7c4b99263da