Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 10:32:12 +0000 (11:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 10:32:12 +0000 (11:32 +0100)

Trivial merge