From: friendica <info@friendica.com>
Date: Wed, 26 Sep 2012 02:11:58 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2cacbdb9e708213ee228be4643a0a4601ff8b932;p=friendica.git

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

2cacbdb9e708213ee228be4643a0a4601ff8b932