Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 7 Apr 2013 21:44:14 +0000 (22:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 7 Apr 2013 21:44:14 +0000 (22:44 +0100)

Trivial merge