Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 12 Nov 2015 21:28:06 +0000 (21:28 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 12 Nov 2015 21:28:06 +0000 (21:28 +0000)

Trivial merge