Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:55:20 +0000 (12:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:55:20 +0000 (12:55 +0000)

Trivial merge