From: David Given <dg@cowlark.com>
Date: Wed, 30 Nov 2016 21:07:29 +0000 (+0100)
Subject: Merge from default.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=90547157b4c80527b6fdbde01e4b8a85f8a1a5f2;p=ack.git

Merge from default.
---

90547157b4c80527b6fdbde01e4b8a85f8a1a5f2