Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 01:49:17 +0000 (02:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 01:49:17 +0000 (02:49 +0100)

Trivial merge