Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:35:08 +0000 (17:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:35:08 +0000 (17:35 +0000)

Trivial merge