From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Nov 2018 20:18:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fed45b32672d22bebfccbb90978d9f8f0b182ef;p=ipfire.org.git

Merge remote-tracking branch 'origin/master'

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

2fed45b32672d22bebfccbb90978d9f8f0b182ef