Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 21:35:23 +0000 (22:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 21:35:23 +0000 (22:35 +0100)

Trivial merge