Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2012 09:02:20 +0000 (10:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2012 09:02:20 +0000 (10:02 +0100)

Trivial merge