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)
commit83495f9a91a4e0f15aa16d51401a188a88fea249
tree99c43c6e544de8945eaa00e888f9d2022a27e059
parentfd965cc4be6fe6de25b3011aea708c41c3cd9e11
parentace5a2fbd7d0044d7bc40e3555905b1f4a085250
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.