Merge branch 'master' of ssh://192.168.1.201/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 6 Jun 2013 20:39:15 +0000 (21:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 6 Jun 2013 20:39:15 +0000 (21:39 +0100)

Trivial merge