chiark / gitweb /
~mdw / firewall / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc00515 c68b8ec)
Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:04:22 +0000 (16:04 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:04:22 +0000 (16:04 +0000)
* master:
  local.m4: Declare network for anycast services.
  local.m4: Reorder forwarding networks for `default'.
  local.m4: Move `vpn' to the common networks section.

1  2 
local.m4 patch | diff1 | diff2 | blob | history

diff --cc local.m4
Simple merge
Firewall scripts for distorted.org.uk.