Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Jul 2013 16:26:16 +0000 (17:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Jul 2013 16:26:16 +0000 (17:26 +0100)

Trivial merge