Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 9 Jun 2016 21:21:14 +0000 (22:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 9 Jun 2016 21:21:14 +0000 (22:21 +0100)

Trivial merge