Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 5 May 2014 11:13:49 +0000 (12:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 5 May 2014 11:13:49 +0000 (12:13 +0100)

Trivial merge