Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 22 Oct 2015 09:30:27 +0000 (10:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 22 Oct 2015 09:30:27 +0000 (10:30 +0100)

Trivial merge