Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Sep 2015 13:04:05 +0000 (14:04 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Sep 2015 13:04:05 +0000 (14:04 +0100)

Trivial merge