Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 2 Oct 2013 08:50:13 +0000 (09:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 2 Oct 2013 08:50:13 +0000 (09:50 +0100)

Trivial merge