Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Mar 2014 14:24:52 +0000 (15:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Mar 2014 14:24:52 +0000 (15:24 +0100)

Trivial merge