From: friendica <info@friendica.com>
Date: Tue, 10 Apr 2012 23:07:05 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=703bfcb6d4bd21e68aaabd5f1b256106c505f0e9;p=friendica.git

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

703bfcb6d4bd21e68aaabd5f1b256106c505f0e9