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

diff --combined config/rootfiles/core/44/filelists/files
index 3bd66d5ba43b7720d4c7bb895d70b86e770632ff,44b01ac12a9ac18b27e8b3397b776828d720c5ac..cd2840e0018fe18fcb97d10678485c188a299787
--- 1/config/rootfiles/core/44/filelists/files
--- 2/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@@ -7,7 -7,9 +7,9 @@@ etc/rc.d/init.d/networking/dhcpcd.ex
  etc/rc.d/init.d/networking/red
  etc/rc.d/init.d/networking/red.up/99-fireinfo
  srv/web/ipfire/cgi-bin/extrahd.cgi
+ srv/web/ipfire/cgi-bin/credits.cgi
  srv/web/ipfire/cgi-bin/index.cgi
+ srv/web/ipfire/cgi-bin/ipinfo.cgi
  srv/web/ipfire/cgi-bin/pakfire.cgi
  srv/web/ipfire/cgi-bin/proxy.cgi
  srv/web/ipfire/cgi-bin/speed.cgi
@@@ -21,8 -23,6 +23,8 @@@ srv/web/ipfire/cgi-bin/memory.cg
  srv/web/ipfire/cgi-bin/netexternal.cgi
  srv/web/ipfire/cgi-bin/netinternal.cgi
  srv/web/ipfire/cgi-bin/system.cgi
 +srv/web/ipfire/cgi-bin/services.cgi
 +srv/web/ipfire/cgi-bin/backup.cgi
  srv/web/ipfire/cgi-bin/logs.cgi/log.dat
  srv/web/ipfire/html/images/urlfilter/copy.gif
  var/ipfire/general-functions.pl