Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next

This commit is contained in:
Michael Tremer
2015-10-21 13:50:07 +01:00
14 changed files with 208 additions and 5 deletions

View File

@@ -100,6 +100,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute