Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 17 Feb 2016 09:32:09 +0000 (09:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 17 Feb 2016 09:32:09 +0000 (09:32 +0000)

Trivial merge