Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 29 May 2015 18:17:24 +0000 (19:17 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 29 May 2015 18:17:24 +0000 (19:17 +0100)

Trivial merge