Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/184/filelists/files b/config/rootfiles/oldcore/184/filelists/files
index dc8a1b28fe095efe37082665efbf14688ca3404a..2b0e4df076c27a79339f29c4464148b87698e65b 100644 (file)
--- a/config/rootfiles/oldcore/184/filelists/files
+++ b/config/rootfiles/oldcore/184/filelists/files
@@ -4,3 +4,4 @@ srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/rules.pl
 var/ipfire/graphs.pl
+etc/collectd.conf