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

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

1e3ebccb97a54caa4ac0740c017ec934d5c2e13d