Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-09-05 16:43:15 +02:00
4 changed files with 5 additions and 2 deletions

View File

@@ -4,3 +4,4 @@ etc/rc.d/init.d/console
usr/local/sbin/setup
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/proxy.cgi

View File

@@ -0,0 +1 @@
../../../common/squid