Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 6 Feb 2017 12:07:59 +0000 (12:07 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 Feb 2017 12:07:59 +0000 (12:07 +0000)

Trivial merge