Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 1 Oct 2015 20:32:39 +0000 (21:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 1 Oct 2015 20:32:39 +0000 (21:32 +0100)

Trivial merge