Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 2 Sep 2014 18:39:44 +0000 (19:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 Sep 2014 18:39:44 +0000 (19:39 +0100)

Trivial merge