From: friendica <info@friendica.com>
Date: Fri, 27 Apr 2012 09:31:37 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4b92e3543c9af26e590cfecf561ff7483e66e6c9;p=friendica.git

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

4b92e3543c9af26e590cfecf561ff7483e66e6c9