Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 23 Nov 2015 16:41:21 +0000 (16:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 Nov 2015 16:41:21 +0000 (16:41 +0000)

Trivial merge