Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 26 Aug 2016 10:19:56 +0000 (11:19 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 26 Aug 2016 10:19:56 +0000 (11:19 +0100)

Trivial merge