From: David Given <dg@cowlark.com>
Date: Sat, 23 Jun 2018 22:08:39 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=bbb98240fe94b9ad5b0d93eb5574d0000f3256ef;p=ack.git

Merge from trunk.
---

bbb98240fe94b9ad5b0d93eb5574d0000f3256ef