Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Jul 2013 12:21:36 +0000 (13:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Jul 2013 12:21:36 +0000 (13:21 +0100)

Trivial merge