Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 27 Sep 2015 00:36:47 +0000 (01:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 27 Sep 2015 00:36:47 +0000 (01:36 +0100)

Trivial merge