~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into emergency
[firewall]
/
local.m4
diff --git
a/local.m4
b/local.m4
index
0a1617f
..
2d9cacb
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-97,7
+97,7
@@
defhost vampire
iface vpn-+ vpn
iface vpn-precision colobdry vpn
defhost ibanez
- iface br-dmz dmz
+ iface br-dmz dmz
unsafe
iface br-unsafe unsafe
defhost gibson