Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Thu, 10 Oct 2019 18:16:46 +0000 (20:16 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 10 Oct 2019 18:16:46 +0000 (20:16 +0200)

Trivial merge