From: Friendika <info@friendika.com>
Date: Thu, 28 Apr 2011 23:08:15 +0000 (-0700)
Subject: Merge https://github.com/friendika/friendika into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b43ed54967e133ca250ee7f42a90d699781d904f;p=friendica.git

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

b43ed54967e133ca250ee7f42a90d699781d904f