Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 13:16:32 +0000 (14:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 13:16:32 +0000 (14:16 +0100)

Trivial merge