Merge branch 'master' of metalzone:public-git/firewall
authorMark Wooding <mdw@distorted.org.uk>
Sat, 17 Apr 2010 15:37:28 +0000 (16:37 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 17 Apr 2010 15:37:28 +0000 (16:37 +0100)
* 'master' of metalzone:public-git/firewall:
  functions.m4, local.m4: Handle fragments in a useful way.
  classify.m4: Correct summary line at the top.
  vampire.m4: Remove the magical DNS DDoS hack.

1  2 
local.m4
vampire.m4

diff --cc local.m4
Simple merge
diff --cc vampire.m4
Simple merge