From: friendica <info@friendica.com>
Date: Sat, 2 Mar 2013 23:47:23 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=583e82aeb5ab36d8466154dd5a3ef790bb91baca;p=friendica.git

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

583e82aeb5ab36d8466154dd5a3ef790bb91baca