Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 14 May 2014 21:35:19 +0000 (22:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 14 May 2014 21:35:19 +0000 (22:35 +0100)

Trivial merge