Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:02:56 +0000 (20:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:02:56 +0000 (20:02 +0000)

Trivial merge