From: friendica <info@friendica.com>
Date: Mon, 24 Sep 2012 08:31:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8df6f249fd3ae5f5a3303f93b4a48d7c6f341afc;p=friendica.git

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

8df6f249fd3ae5f5a3303f93b4a48d7c6f341afc