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

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

266512e801f658bcd0d82c0588013c00bea03621