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

Trivial merge