Merge branch 'next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:15:01 +0000 (00:15 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:15:01 +0000 (00:15 +0100)
1  2 
config/rootfiles/common/apache2
make.sh

@@@ -1388,13 -1388,12 +1388,14 @@@ srv/web/ipfire/cgi-bin/connscheduler.cg
  srv/web/ipfire/cgi-bin/country.cgi
  srv/web/ipfire/cgi-bin/credits.cgi
  srv/web/ipfire/cgi-bin/dns.cgi
+ srv/web/ipfire/cgi-bin/dnsforward.cgi
  srv/web/ipfire/cgi-bin/ddns.cgi
  srv/web/ipfire/cgi-bin/dhcp.cgi
 -srv/web/ipfire/cgi-bin/dmzholes.cgi
 +#srv/web/ipfire/cgi-bin/dmzholes.cgi
  srv/web/ipfire/cgi-bin/extrahd.cgi
  srv/web/ipfire/cgi-bin/fireinfo.cgi
 +srv/web/ipfire/cgi-bin/firewall.cgi
 +srv/web/ipfire/cgi-bin/fwhosts.cgi
  srv/web/ipfire/cgi-bin/gui.cgi
  srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
  srv/web/ipfire/cgi-bin/hosts.cgi
diff --cc make.sh
Simple merge