Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Jun 2016 11:24:24 +0000 (12:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Jun 2016 11:24:24 +0000 (12:24 +0100)

Trivial merge