From: David Given <dg@cowlark.com>
Date: Sat, 19 Mar 2016 13:54:03 +0000 (+0100)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=33ae5dc4bc37346d5fe2f45454658d2f7d2129a2;p=ack.git

Merge from trunk.

--HG--
branch : default-branch
---

33ae5dc4bc37346d5fe2f45454658d2f7d2129a2