From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 11 May 2015 14:26:04 +0000 (+0100)
Subject: Merge branch 'upstream' into tmp
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/664fb931eebc051998e1a053c50a949405577676

Merge branch 'upstream' into tmp

* upstream:
  functions.m4 (ntpclient): Handle NTP servers with IPv6 addresses.
  local.m4: Allow IPv6 ping separately.
  telecaster.m4: External SMTP service for mailing lists.
  local.mk: Remove orange and mango.
  jem.m4, vampire.m4: Cull some external services.
  local.m4: gibson now uses explicit VLAN tagging.
  functions.m4: Only call `allow-non-init-frag' on fragments.

Conflicts:
	local.m4
	local.mk
---

664fb931eebc051998e1a053c50a949405577676