Merge remote-tracking branch 'origin/next' into thirteen

This commit is contained in:
Arne Fitzenreiter
2012-11-07 00:01:32 +01:00
17 changed files with 129 additions and 94 deletions

View File

@@ -1,4 +1,6 @@
etc/system-release
etc/issue
etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ids.cgi
var/ipfire/outgoing/bin/outgoingfw.pl