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)
commitda61a304a10de72288782a9d872769fe44576f50
tree3093f62e4c8011c8fef73dba207264e0b3ef1ef7
parent06d7ec6b13af05465b2d88998be2bfbe7c3c43d6
parent7024f2155d8d5e4754d5c1ce0ccf8352149f81cd
Merge branch 'upstream'
fai/config/basefiles/mk-basefile
fai/config/scripts/LAST/50-misc