From: friendica <info@friendica.com>
Date: Tue, 2 Sep 2014 08:09:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=910293729c55eb1d21e2fb7d9c9b8888e368135d;p=friendica.git

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

910293729c55eb1d21e2fb7d9c9b8888e368135d