Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-05-10 19:20:43 +02:00
10 changed files with 728 additions and 8 deletions

View File

@@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl