Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Jul 2013 11:31:58 +0000 (12:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Jul 2013 11:31:58 +0000 (12:31 +0100)

Trivial merge