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

Trivial merge