Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/44/filelists/files

diff --cc config/rootfiles/core/44/filelists/files
index c4eca7310d588dbee640fadefdd4a02493278b73,ec4299661861548156bf6b616c3e51f31d1ae462..48c38e2f501fd534238f9ee044bffc72c116dc1b
--- 1/config/rootfiles/core/44/filelists/files
--- 2/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@@ -39,7 -39,7 +39,8 @@@ var/ipfire/langs/en.p
  var/ipfire/langs/fr.pl
  var/ipfire/langs/es.pl
  var/ipfire/menu.d/10-system.menu
 +usr/local/bin/fireinfoctrl
+ var/ipfire/qos/bin/makeqosscripts.pl
  usr/local/bin/timectrl
  usr/local/bin/rebuild-initrd
  usr/local/bin/scanhd