Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 09:49:32 +0000 (09:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 09:49:32 +0000 (09:49 +0000)

Trivial merge