Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 21 May 2015 09:43:00 +0000 (10:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 21 May 2015 09:43:00 +0000 (10:43 +0100)

Trivial merge