From: friendica <info@friendica.com>
Date: Sun, 6 May 2012 00:54:19 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=47c3b43afd64cd1c05b67d347fb1219c42fe6d20;p=friendica.git

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

47c3b43afd64cd1c05b67d347fb1219c42fe6d20