Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Oct 2014 10:18:32 +0000 (11:18 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 22 Oct 2014 10:18:32 +0000 (11:18 +0100)

Trivial merge