Merge branch '.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 15:45:39 +0000 (16:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 15:45:39 +0000 (16:45 +0100)

Trivial merge