Merge branch 'master' of git.carlh.net:git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:47:05 +0000 (16:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:47:05 +0000 (16:47 +0100)

Trivial merge