Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Tue, 6 Mar 2012 10:43:58 +0000 (10:43 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 6 Mar 2012 10:43:58 +0000 (10:43 +0000)
commitfd965cc4be6fe6de25b3011aea708c41c3cd9e11
tree48bbe5a0137ce3e72fc2ce50e0570cc097d1c881
parent3adc5b0b8fe2f9270e053f7bc46449651b78266e
parentdad380658e5cb8f7233bc5f8ab328a2959f9f6ce
Merge branch 'master' into emergency

* master:
  radius.m4: Forbid traffic directly to the NAT address.
  radius.m4: Use the correct interface name for NAT.
  local.m4: Fix IGMP acceptance (debris from old interface declarations).