Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 22 Apr 2016 10:48:05 +0000 (11:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 22 Apr 2016 10:48:05 +0000 (11:48 +0100)

Trivial merge