From: Jens Tautenhahn <shogun@tausys.de>
Date: Mon, 14 Nov 2016 08:52:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=31ad26aae2856fdf7921c53abb8ae525792a05d4;hp=-c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into develop
---

31ad26aae2856fdf7921c53abb8ae525792a05d4