From: friendica <info@friendica.com>
Date: Fri, 2 Nov 2012 00:21:55 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ce932dfdaf3c7b96544a67607c2ec9a99c588db0;p=friendica.git

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

ce932dfdaf3c7b96544a67607c2ec9a99c588db0