From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 24 Mar 2012 17:07:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin' into emergency
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/b4d07df30bdd2132a03de9a22512560d585d918a?hp=b4d07df30bdd2132a03de9a22512560d585d918a

Merge remote-tracking branch 'origin' into emergency

* 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
---