From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 7 Mar 2012 03:06:39 +0000 (+0000)
Subject: Merge branch 'master' into emergency
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/3e47a702519350809a38400b03b79d37abbc4d13?hp=-c

Merge branch 'master' into emergency

* master:
  Move per-host filtering to diversion 86 as promised.
  local.m4: Add `unsafe' to ibanez `br-dmz' interface.
---

3e47a702519350809a38400b03b79d37abbc4d13