Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 50 / filelists / files

etc/sysctl.conf
etc/system-release
var/ipfire/langs/
etc/rc.d/init.d/console
usr/local/sbin/setup