Merge remote-tracking branch 'ms/iptables-conntrack' into next

This commit is contained in:
Michael Tremer
2016-01-22 00:54:14 +00:00
15 changed files with 122 additions and 21 deletions

View File

@@ -640,6 +640,7 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: age second
WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit