Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)

Trivial merge