From: David Given <dg@cowlark.com>
Date: Sat, 15 Oct 2016 22:06:14 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=32c53a452d05fc700469cf94bebb899e58fe7957;p=ack.git

Merge from trunk.
---

32c53a452d05fc700469cf94bebb899e58fe7957