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)
commit4ee1b00b120df125f2f77277d58a8871c7233969
tree5656266df8222a55fa1ed0e1a0c1c5fb2e97cf30
parented215f2af8175d05302be8b12cddcf122ca8a17c
parent781acc946464f4073274fb9e4743661f1c7ad0dc
Merge branch 'master' of /home/mdw/public-git/firewall

* '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.