From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 7 Mar 2012 02:52:52 +0000 (+0000)
Subject: Merge branch 'master' into emergency
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/83495f9a91a4e0f15aa16d51401a188a88fea249

Merge branch 'master' into emergency

* master:
  functions: Move NTP server list out of line.
  local.m4: Allow dmz/jump packets on unsafe/colo networks and vice versa.
---

83495f9a91a4e0f15aa16d51401a188a88fea249