Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000 (09:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000 (09:47 +0100)
1  2 
src/lib/film.cc

diff --cc src/lib/film.cc
Simple merge