Merge branch '1.0' of ssh://houllier/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 20 Jun 2013 20:21:31 +0000 (21:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 20 Jun 2013 20:21:31 +0000 (21:21 +0100)

Trivial merge