From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Jan 2011 23:31:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-rc1~10
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d22501e8132e671db2a362d95345347792f9bd31

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

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

d22501e8132e671db2a362d95345347792f9bd31
diff --cc config/rootfiles/core/44/filelists/files
index c4eca7310d,ec42996618..48c38e2f50
--- a/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