Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 6 Nov 2013 09:55:09 +0000 (09:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 6 Nov 2013 09:55:09 +0000 (09:55 +0000)

Trivial merge