Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 6 Mar 2018 09:52:54 +0000 (09:52 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 6 Mar 2018 09:52:54 +0000 (09:52 +0000)

Trivial merge