Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 27 May 2014 13:40:12 +0000 (14:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 27 May 2014 13:40:12 +0000 (14:40 +0100)

Trivial merge