From: friendica <info@friendica.com>
Date: Wed, 3 Apr 2013 23:29:13 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8b51ffefc0839267eb4635109501ce2b021a3e8c;p=friendica.git

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

8b51ffefc0839267eb4635109501ce2b021a3e8c