Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Jan 2014 19:11:11 +0000 (19:11 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Jan 2014 19:11:11 +0000 (19:11 +0000)

Trivial merge