Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 30 Nov 2015 13:36:50 +0000 (13:36 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 30 Nov 2015 13:36:50 +0000 (13:36 +0000)

Trivial merge