From: friendica <info@friendica.com>
Date: Sun, 28 Apr 2013 11:31:11 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2883c8bbc49535cf47fbe53088fad6a150bc3df0;p=friendica.git

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

2883c8bbc49535cf47fbe53088fad6a150bc3df0