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

Trivial merge