From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 17 Apr 2010 15:39:42 +0000 (+0100)
Subject: Merge branch 'master' of /home/mdw/public-git/firewall
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/4ee1b00b120df125f2f77277d58a8871c7233969

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

4ee1b00b120df125f2f77277d58a8871c7233969