From: friendica <info@friendica.com>
Date: Thu, 13 Sep 2012 00:20:52 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3d6c49d5b3d4447ad91a5a4f4123c9fd9d4584cf;p=friendica.git

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

3d6c49d5b3d4447ad91a5a4f4123c9fd9d4584cf