From: friendica <info@friendica.com>
Date: Wed, 23 May 2012 22:46:49 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8bc8be1f8741fde802643744748db69a5a52237c;p=friendica.git

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

8bc8be1f8741fde802643744748db69a5a52237c