Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 6 Nov 2015 20:24:04 +0000 (20:24 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 6 Nov 2015 20:24:04 +0000 (20:24 +0000)

Trivial merge