Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 7 May 2015 11:54:04 +0000 (12:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 7 May 2015 11:54:04 +0000 (12:54 +0100)

Trivial merge