Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 21:26:26 +0000 (22:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 21:26:26 +0000 (22:26 +0100)

Trivial merge