Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2019 10:12:24 +0000 (11:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2019 10:12:24 +0000 (11:12 +0100)

Trivial merge