Merge branch 'next' into fifteen

This commit is contained in:
Arne Fitzenreiter
2013-12-10 00:15:01 +01:00
17 changed files with 122 additions and 341 deletions

View File

@@ -1388,6 +1388,7 @@ srv/web/ipfire/cgi-bin/connscheduler.cgi
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