Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 12 May 2014 09:07:05 +0000 (10:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 12 May 2014 09:07:05 +0000 (10:07 +0100)

Trivial merge