From: friendica <info@friendica.com>
Date: Sat, 18 May 2013 23:03:35 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=024fe68d71e865b2b235019753851a100da5fad4;p=friendica.git

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

024fe68d71e865b2b235019753851a100da5fad4