Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 8 Feb 2015 18:27:19 +0000 (18:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 8 Feb 2015 18:27:19 +0000 (18:27 +0000)

Trivial merge