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

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

b661e61d6a2fc4f74e3de3eccc684acab021433f