From: David Given <dg@cowlark.com>
Date: Sat, 4 Jun 2016 16:51:46 +0000 (+0200)
Subject: Merge from default.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4de13bbe0d402e3812fa264c3c400e147a524660;p=ack.git

Merge from default.

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

4de13bbe0d402e3812fa264c3c400e147a524660