Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 28 Sep 2015 11:14:33 +0000 (12:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 28 Sep 2015 11:14:33 +0000 (12:14 +0100)

Trivial merge