Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 20:17:43 +0000 (21:17 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 20:17:43 +0000 (21:17 +0100)

Trivial merge