From: David Given <dg@cowlark.com>
Date: Thu, 10 Nov 2016 21:06:08 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4d7c27391f14f68c23eb60c205df770a236fbf30;p=ack.git

Merge.
---

4d7c27391f14f68c23eb60c205df770a236fbf30