Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 23:32:17 +0000 (00:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 23:32:17 +0000 (00:32 +0100)

Trivial merge