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

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

a7421990350e2409ee90957dab37e1ff1fc272df