Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 4 Dec 2015 02:02:13 +0000 (02:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 4 Dec 2015 02:02:13 +0000 (02:02 +0000)

Trivial merge