Merge branch 'master' of ssh://git.carlh.net/home/carl/git/cdist
authorCarl Hetherington <cth@carlh.net>
Thu, 5 Mar 2020 11:45:39 +0000 (12:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 5 Mar 2020 11:45:39 +0000 (12:45 +0100)

Trivial merge