Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Sat, 26 Oct 2013 22:27:01 +0000 (23:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 26 Oct 2013 22:27:01 +0000 (23:27 +0100)

Trivial merge