Merge branch 'upstream'
authorIan Kelling <iank@fsf.org>
Sat, 7 Oct 2017 23:10:13 +0000 (16:10 -0700)
committerIan Kelling <iank@fsf.org>
Sat, 7 Oct 2017 23:10:13 +0000 (16:10 -0700)
1  2 
fai/config/basefiles/mk-basefile
fai/config/scripts/LAST/50-misc

Simple merge
Simple merge