From: friendica <info@friendica.com>
Date: Fri, 11 May 2012 01:50:37 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=01b5136007ee853a22205b87433f94640d3aceac;p=friendica.git

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

01b5136007ee853a22205b87433f94640d3aceac