Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Dec 2012 22:18:59 +0000 (22:18 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 7 Dec 2012 22:18:59 +0000 (22:18 +0000)

Trivial merge