From: Maniacikarus <maniacikarus@ipfire.org>
Date: Sat, 27 Sep 2008 16:34:31 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~14^2~24
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=74e82b68e80899e5712697383ee05443e91b19f3

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

74e82b68e80899e5712697383ee05443e91b19f3
diff --cc config/rootfiles/updater/filelists/files
index ea76db77b1,71ea341781..ba7ba3409c
--- a/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