~mdw / firewall / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd965cc ace5a2f)
Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Wed, 7 Mar 2012 02:52:52 +0000 (02:52 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 7 Mar 2012 02:52:52 +0000 (02:52 +0000)
* master:
  functions: Move NTP server list out of line.
  local.m4: Allow dmz/jump packets on unsafe/colo networks and vice versa.


Trivial merge
Firewall scripts for distorted.org.uk.