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

@@ -21,6 +21,7 @@ WARNING: translation string unused: add-route
WARNING: translation string unused: addon
WARNING: translation string unused: admin user password has been changed
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM auth
WARNING: translation string unused: advproxy advanced proxy