From: David Given <dg@cowlark.com>
Date: Wed, 13 Jun 2018 12:47:25 +0000 (+0900)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=519eef933cc11cd8e40aa6c807c020b62ccdca29;p=ack.git

Merge from trunk.
---

519eef933cc11cd8e40aa6c807c020b62ccdca29