Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:49 +0000 (15:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:49 +0000 (15:10 +0000)

Trivial merge