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

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

d340b80094cbaf33f3989422240be929741b0ff8