From: David Given <dg@cowlark.com>
Date: Sat, 5 Aug 2017 19:47:40 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=a9f19a2a313a762f6a4b6e1cb2632d9149bab444;p=ack.git

Merge.
---

a9f19a2a313a762f6a4b6e1cb2632d9149bab444