Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Oct 2013 10:52:26 +0000 (11:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Oct 2013 10:52:26 +0000 (11:52 +0100)

Trivial merge