Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 28 Oct 2015 12:48:26 +0000 (12:48 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 28 Oct 2015 12:48:26 +0000 (12:48 +0000)

Trivial merge