Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 10:23:47 +0000 (10:23 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 10:23:47 +0000 (10:23 +0000)

Trivial merge