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

Trivial merge