Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Jun 2016 13:09:52 +0000 (14:09 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Jun 2016 13:09:52 +0000 (14:09 +0100)

Trivial merge