From: Ian Kelling <iank@fsf.org>
Date: Sun, 8 Oct 2017 17:16:17 +0000 (-0700)
Subject: Merge branch 'upstream', fai 5.4
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=e6c8a36522847eca91819ab3eb656dd824bc3e3c;hp=e6c8a36522847eca91819ab3eb656dd824bc3e3c;p=automated-distro-installer

Merge branch 'upstream', fai 5.4
---