Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 2 Jul 2015 08:20:00 +0000 (09:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 2 Jul 2015 08:20:00 +0000 (09:20 +0100)

Trivial merge