Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 1 Jul 2016 21:49:25 +0000 (22:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 1 Jul 2016 21:49:25 +0000 (22:49 +0100)

Trivial merge