Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 5 Jan 2014 22:58:12 +0000 (22:58 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 5 Jan 2014 22:58:12 +0000 (22:58 +0000)

Trivial merge