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)
commit3e47a702519350809a38400b03b79d37abbc4d13
tree8e48caca0f43e35edeca7fd0485d22d0c738ea6f
parent83495f9a91a4e0f15aa16d51401a188a88fea249
parent1a42af95515f1f6920f0ba2b45576278bbc2c8cf
Merge branch 'master' into emergency

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