Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sat, 17 Jan 2015 01:49:17 +0000 (01:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 17 Jan 2015 01:49:17 +0000 (01:49 +0000)

Trivial merge