Merge remote-tracking branch 'ms/squid-ad' into next

This commit is contained in:
Michael Tremer
2014-07-27 12:01:50 +02:00
33 changed files with 896 additions and 254 deletions

View File

@@ -131,7 +131,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d

View File

@@ -134,7 +134,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d