Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 6 Oct 2015 15:50:52 +0000 (16:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 6 Oct 2015 15:50:52 +0000 (16:50 +0100)

Trivial merge