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

Trivial merge