Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sat, 16 May 2015 11:18:16 +0000 (12:18 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 16 May 2015 11:18:16 +0000 (12:18 +0100)

Trivial merge