From: Ian Kelling <iank@fsf.org>
Date: Tue, 24 Nov 2020 22:12:32 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=fe81034ee9664d8e131bac218b40d99a58a31649;hp=fe81034ee9664d8e131bac218b40d99a58a31649;p=automated-distro-installer

Merge branch 'upstream'

Switched UBUNTU to use DEBIAN + UBUNTU to be more in line with
upstream. I expect this may break things.
---