Merge branch 'master' of git.carlh.net:git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Oct 2014 09:27:56 +0000 (10:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Oct 2014 09:27:56 +0000 (10:27 +0100)

Trivial merge