Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000 (18:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000 (18:56 +0100)

Trivial merge