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

Trivial merge