Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 21 Jan 2015 10:19:11 +0000 (10:19 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 21 Jan 2015 10:19:11 +0000 (10:19 +0000)

Trivial merge