From: friendica <info@friendica.com>
Date: Wed, 11 Apr 2012 23:45:19 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d52dad3826ebed717dc7a9d24ac670cdd33e16f8;p=friendica.git

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

d52dad3826ebed717dc7a9d24ac670cdd33e16f8