Merge remote-tracking branch 'ms/cleanup' into next

diff --cc config/cfgroot/header.pl
index 66b49e4117c15aabf951cb01ae597c62270dfdf0,d173c1841cd11e5b736884a93f53ecdbf69518c4..af524af53e3177d7544b671f44a5cad818f9853f
--- 1/config/cfgroot/header.pl
--- 2/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@@ -16,8 -16,9 +16,10 @@@ use File::Basename
  use HTML::Entities();
  use Socket;
  use Time::Local;
 +use Encode;
  
+ require "${General::swroot}/graphs.pl";
+ 
  our %color = ();
  &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
  

diff --cc src/initscripts/networking/red
Simple merge