From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Dec 2013 23:15:01 +0000 (+0100)
Subject: Merge branch 'next' into fifteen
X-Git-Tag: v2.15-beta1~116
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5d4d41b18c80f236b4dc796e1394ef0035cb034d

Merge branch 'next' into fifteen
---

5d4d41b18c80f236b4dc796e1394ef0035cb034d
diff --cc config/rootfiles/common/apache2
index a1cd423c50,c18b5ed676..4640fa4aff
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@@ -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