Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 10:41:47 +0000 (11:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 10:41:47 +0000 (11:41 +0100)

Trivial merge