Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)

Trivial merge