Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 13:35:34 +0000 (13:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 13:35:34 +0000 (13:35 +0000)

Trivial merge