From: David Given <dg@cowlark.com>
Date: Mon, 12 Dec 2016 22:58:24 +0000 (+0100)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=9b525d741e703c0103c5b10c3c8c8df8314aec95;p=ack.git

Merge from trunk.
---

9b525d741e703c0103c5b10c3c8c8df8314aec95