From: Mark Wooding Date: Mon, 17 Jan 2011 15:30:06 +0000 (+0000) Subject: Merge branch 'master' of /home/mdw/public-git/firewall X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/6f0a7bc1a8dec07b7768a1b6d8f592190c7e63d4?hp=--cc 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. --- 6f0a7bc1a8dec07b7768a1b6d8f592190c7e63d4