Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Oct 2012 02:29:55 +0000 (03:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Oct 2012 02:29:55 +0000 (03:29 +0100)

Trivial merge