From: friendica <info@friendica.com>
Date: Wed, 12 Sep 2012 01:57:40 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ec1abfda4628e623293c1aa50b7efdc54198cd5e;p=friendica.git

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

ec1abfda4628e623293c1aa50b7efdc54198cd5e