Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-06-12 00:01:26 +02:00
6 changed files with 69 additions and 18 deletions

View File

@@ -1 +1 @@
/srv/web/ipfire/html/proxy.pac
srv/web/ipfire/html/proxy.pac