Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2015 16:55:08 +0000 (17:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2015 16:55:08 +0000 (17:55 +0100)

Trivial merge