Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 24 Jul 2013 15:28:28 +0000 (16:28 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 24 Jul 2013 15:28:28 +0000 (16:28 +0100)

Trivial merge