Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 23 Jan 2015 17:15:18 +0000 (17:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 23 Jan 2015 17:15:18 +0000 (17:15 +0000)

Trivial merge