From: Mark Wooding Date: Fri, 30 Mar 2012 16:41:50 +0000 (+0100) Subject: Merge branch 'master' into emergency X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/refs/heads/emergency Merge branch 'master' into emergency * master: fender.m4: Define an address to be a guaranteed black hole. --- 79bce11d31404ea3a71d9531770632d1b951628b