Merge branch 'master' of /home/mdw/public-git/firewall
authorMark Wooding <mdw@distorted.org.uk>
Mon, 7 Mar 2011 11:06:51 +0000 (11:06 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 7 Mar 2011 11:06:51 +0000 (11:06 +0000)
commitf2cfcfa875be6c08dbcc21fe31ca8fed89224bd3
tree6ab7733b2a5fbd13590e2a01e4aea69b6ead0609
parent77e84a029d77f4bc169f90fd888342762f5af0e5
parentdeee94301a9892b3568cd134756ef73e825bf148
Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  vampire: Allow outside access to squid.
  vampire: Allow SMB from the untrusted network.
numbers.m4