Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 6 Jan 2013 14:31:12 +0000 (14:31 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 6 Jan 2013 14:31:12 +0000 (14:31 +0000)

Trivial merge