Merge remote-tracking branch 'origin' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Sat, 24 Mar 2012 17:07:36 +0000 (17:07 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 24 Mar 2012 17:07:36 +0000 (17:07 +0000)
* origin:
  local.m4: A new network for the SGO VPN.
  functions.m4, classify.m4: Handle negative address ranges.
  Make FW_NOACT work properly.

Conflicts:
local.m4


No differences found