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

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

8a112aee0012383c5328021a5b0637957439cbaa