Merge branch 'master' into i18n
authorCarl Hetherington <cth@carlh.net>
Fri, 22 Feb 2013 18:58:31 +0000 (18:58 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 22 Feb 2013 18:58:31 +0000 (18:58 +0000)
1  2 
src/lib/film.cc
wscript

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