chiark / gitweb /
~mdw / firewall / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d8e37f3 ebaa31a)
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)
commitb4d07df30bdd2132a03de9a22512560d585d918a
treecdf0f753742fbf529724d440706c475e315c3fa9tree | snapshot
parentd8e37f37a3d09961f5bb0ab438e5ed2becba736dcommit | diff
parentebaa31a7bdb640c1bd797fef04d1e833a34c07d7commit | diff
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
bookends.m4 diff1 | diff2 | blob | history
functions.m4 diff1 | diff2 | blob | history
local.m4 diff1 | diff2 | blob | history
Firewall scripts for distorted.org.uk.