Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Sep 2012 22:09:15 +0000 (23:09 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Sep 2012 22:09:15 +0000 (23:09 +0100)

Trivial merge