Merge branch '1.0' of ssh://houllier/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Sun, 9 Jun 2013 16:28:51 +0000 (17:28 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 9 Jun 2013 16:28:51 +0000 (17:28 +0100)

Trivial merge