Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --combined config/rootfiles/core/125/filelists/files
index 26ac36080a49b4989bb75cf4d8edb0f9f00a8794,47c0e77f3b70be0dc4f2cd779e630c6e632856d0..f2afb62fbf6597f1d613849002b2d97b56f6a260
--- 1/config/rootfiles/core/125/filelists/files
--- 2/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@@ -3,5 -3,7 +3,8 @@@ etc/issu
  etc/ssh/sshd_config
  etc/sysctl.conf
  srv/web/ipfire/cgi-bin/credits.cgi
+ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+ srv/web/ipfire/cgi-bin/media.cgi
 +srv/web/ipfire/cgi-bin/pakfire.cgi
+ usr/local/bin/makegraphs
  var/ipfire/langs