Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 28 Jul 2016 15:43:28 +0000 (16:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 28 Jul 2016 15:43:28 +0000 (16:43 +0100)

Trivial merge