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)
* 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).


Trivial merge