From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 17 Mar 2012 16:04:22 +0000 (+0000)
Subject: Merge branch 'master' into emergency
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/d8e37f37a3d09961f5bb0ab438e5ed2becba736d

Merge branch 'master' into emergency

* master:
  local.m4: Declare network for anycast services.
  local.m4: Reorder forwarding networks for `default'.
  local.m4: Move `vpn' to the common networks section.
---

d8e37f37a3d09961f5bb0ab438e5ed2becba736d