Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 8 Apr 2016 22:51:05 +0000 (23:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 8 Apr 2016 22:51:05 +0000 (23:51 +0100)

Trivial merge