Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Jan 2014 10:13:05 +0000 (10:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Jan 2014 10:13:05 +0000 (10:13 +0000)

Trivial merge