From: David Given <dg@cowlark.com>
Date: Sat, 1 Sep 2018 13:34:36 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=bed39e1f4dd2c74dd4c838d29188cae189449dc2;p=ack.git

Merge.
---

bed39e1f4dd2c74dd4c838d29188cae189449dc2