Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Wed, 7 Mar 2012 03:06:39 +0000 (03:06 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 7 Mar 2012 03:06:39 +0000 (03:06 +0000)
* master:
  Move per-host filtering to diversion 86 as promised.
  local.m4: Add `unsafe' to ibanez `br-dmz' interface.


Trivial merge