Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 10:39:06 +0000 (10:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 10:39:06 +0000 (10:39 +0000)

Trivial merge