Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 14 Feb 2014 14:00:53 +0000 (14:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 14 Feb 2014 14:00:53 +0000 (14:00 +0000)

Trivial merge