Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 19:59:07 +0000 (19:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 19:59:07 +0000 (19:59 +0000)

Trivial merge