Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Oct 2012 10:26:57 +0000 (11:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Oct 2012 10:26:57 +0000 (11:26 +0100)

Trivial merge