From: Andrej Stieben <e-mail@stieben.de>
Date: Mon, 8 Feb 2016 21:23:01 +0000 (+0100)
Subject: Merge pull request #1 from friendica/develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=909bca90e872be898c36aadac175b93badce5460;p=friendica.git

Merge pull request #1 from friendica/develop

Merge upstream/develop
---

909bca90e872be898c36aadac175b93badce5460