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

Trivial merge