From: Carl Hetherington <cth@carlh.net>
Date: Sun, 2 Sep 2018 22:39:56 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v1.4.0~14
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=60d922b58e459ac587e54f4509e84cdbd35356b4;p=libsub.git

Merge.
---

60d922b58e459ac587e54f4509e84cdbd35356b4