Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 11 Jan 2015 22:59:59 +0000 (22:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 11 Jan 2015 22:59:59 +0000 (22:59 +0000)

Trivial merge