Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 21 Jun 2014 11:07:55 +0000 (12:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 21 Jun 2014 11:07:55 +0000 (12:07 +0100)

Trivial merge