Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 18:12:13 +0000 (19:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 18:12:13 +0000 (19:12 +0100)

Trivial merge