chiark / gitweb /
~mdw / firewall / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2ee3987 422ec1b)
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)
* '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.


Trivial merge
Firewall scripts for distorted.org.uk.