Merge branch 'upstream'
[automated-distro-installer] / fai / config / files / etc / apt / preferences.d / belenos / BELENOS
2017-10-07 Ian KellingMerge branch 'upstream'
2017-05-05 Ian Kellingadd flidas support, fix typo