Merge branch '0.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 22 Jul 2014 18:52:49 +0000 (19:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 22 Jul 2014 18:52:49 +0000 (19:52 +0100)

Trivial merge