Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 09:35:43 +0000 (09:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 09:35:43 +0000 (09:35 +0000)

Trivial merge