Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Jan 2011 23:31:41 +0000 (00:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Jan 2011 23:31:41 +0000 (00:31 +0100)
Conflicts:
config/rootfiles/core/44/filelists/files

1  2 
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