Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 20 Jun 2014 22:35:34 +0000 (23:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 20 Jun 2014 22:35:34 +0000 (23:35 +0100)

Trivial merge