Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 12:57:59 +0000 (12:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 12:57:59 +0000 (12:57 +0000)

Trivial merge