Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Jun 2016 00:19:33 +0000 (01:19 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 22 Jun 2016 00:19:33 +0000 (01:19 +0100)

Trivial merge