Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 3 Jun 2015 15:09:44 +0000 (16:09 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 3 Jun 2015 15:09:44 +0000 (16:09 +0100)

Trivial merge