Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Feb 2018 20:42:05 +0000 (20:42 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Feb 2018 20:42:05 +0000 (20:42 +0000)

Trivial merge