From: friendica <info@friendica.com>
Date: Wed, 22 Aug 2012 02:42:37 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4f72e656cab215ef122b44fb96d920f422b9a31c;p=friendica.git

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

4f72e656cab215ef122b44fb96d920f422b9a31c