Merge branch 'upstream'
authorIan Kelling <iank@fsf.org>
Tue, 24 Nov 2020 22:12:32 +0000 (17:12 -0500)
committerIan Kelling <iank@fsf.org>
Tue, 24 Nov 2020 22:12:32 +0000 (17:12 -0500)
Switched UBUNTU to use DEBIAN + UBUNTU to be more in line with
upstream. I expect this may break things.


No differences found