Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Aug 2013 19:33:49 +0000 (20:33 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Aug 2013 19:33:49 +0000 (20:33 +0100)

Trivial merge