From: Michael <heluecht@pirati.ca>
Date: Mon, 16 Jan 2017 21:06:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1701-index-again
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d6ca6f24a725e245c4cd8daeea110dc8f5932187;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1701-index-again
---

d6ca6f24a725e245c4cd8daeea110dc8f5932187