Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 13:38:50 +0000 (14:38 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 13:38:50 +0000 (14:38 +0100)

Trivial merge