Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Jul 2018 18:59:21 +0000 (19:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Jul 2018 18:59:21 +0000 (19:59 +0100)

Trivial merge