Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 6 Mar 2014 21:12:34 +0000 (21:12 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 6 Mar 2014 21:12:34 +0000 (21:12 +0000)

Trivial merge