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

Trivial merge