Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 12 Sep 2016 10:13:58 +0000 (11:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 12 Sep 2016 10:13:58 +0000 (11:13 +0100)

Trivial merge