Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 12:51:52 +0000 (12:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 12:51:52 +0000 (12:51 +0000)

Trivial merge