From: friendica <info@friendica.com>
Date: Fri, 25 May 2012 07:43:09 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d1345e505406b1a1cdc3fc26a1734916c8abc89d;p=friendica.git

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

d1345e505406b1a1cdc3fc26a1734916c8abc89d