From: Ian Kelling <iank@fsf.org>
Date: Thu, 4 Jul 2019 03:28:46 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;hp=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;p=automated-distro-installer

Merge branch 'upstream'

Tested with flidas vm.
---