Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Michael Tremer
2011-06-26 18:08:40 +02:00
8 changed files with 39 additions and 10 deletions

View File

@@ -2,7 +2,11 @@ etc/sysctl.conf
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
usr/local/bin/ipsecctrl
usr/local/bin/vpn-watch