From: friendica <info@friendica.com>
Date: Mon, 10 Sep 2012 23:20:35 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=23770896c1dcb148259a0b162e03daf2465ba664;p=friendica.git

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

23770896c1dcb148259a0b162e03daf2465ba664