Merge branch 'master' of /home/mdw/public-git/firewall
authorMark Wooding <mdw@distorted.org.uk>
Mon, 17 Jan 2011 15:30:06 +0000 (15:30 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 17 Jan 2011 15:30:06 +0000 (15:30 +0000)
commit6f0a7bc1a8dec07b7768a1b6d8f592190c7e63d4
treedba3ffa52f2d798b7593824c64317227eb5e74d0
parent2ee3987faf2592f75b0af917e8771d23de5286b7
parent422ec1b21e2cd6ff4f7cb1a14af49ca92eb68ac5
Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  local.m4: Put the default network stanza at the end.
  local.m4: Note terror's participation in the VPN.