Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:20:00 +0000 (12:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:20:00 +0000 (12:20 +0100)

Trivial merge