From: friendica <info@friendica.com>
Date: Mon, 21 May 2012 01:30:52 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=71fe34332454e6dab239f8af27a1dcac3ba4b2e5;p=friendica.git

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

71fe34332454e6dab239f8af27a1dcac3ba4b2e5