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

diff --cc config/rootfiles/updater/filelists/files
index ea76db77b1ddc534ad7f6f525d27ec57e2bbe76a,71ea3417816d4535cf4cb35ce8af3b2172b1cd7c..ba7ba3409c9574c4470a024cc3998517acae83f3
--- 1/config/rootfiles/updater/filelists/files
--- 2/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@@ -31,10 -32,8 +32,11 @@@ srv/web/ipfire/cgi-bin/netexternal.cg
  srv/web/ipfire/cgi-bin/netinternal.cgi
  srv/web/ipfire/cgi-bin/netother.cgi
  srv/web/ipfire/cgi-bin/system.cgi
 +srv/web/ipfire/cgi-bin/services.cgi
 +srv/web/ipfire/cgi-bin/media.cgi
 +srv/web/ipfire/cgi-bin/memory.cgi
  srv/web/ipfire/cgi-bin/ids.cgi
+ srv/web/ipfire/cgi-bin/ddns.cgi
  var/ipfire/sensors/
  var/ipfire/graphs.pl
  var/ipfire/firebuild