Merge branch 'master' of /home/mdw/public-git/firewall
authorMark Wooding <mdw@distorted.org.uk>
Sat, 17 Apr 2010 15:39:42 +0000 (16:39 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 17 Apr 2010 15:39:42 +0000 (16:39 +0100)
* 'master' of /home/mdw/public-git/firewall:
  vampire.m4: Allow MPD again.
  Add iodine support..
  vampire: Open `disorder' port; close `mpd'.
  vampire: Allow MPD traffic through.


Trivial merge