Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 5 Jun 2014 13:00:20 +0000 (14:00 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 5 Jun 2014 13:00:20 +0000 (14:00 +0100)

Trivial merge