Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 14:20:40 +0000 (15:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 14:20:40 +0000 (15:20 +0100)

Trivial merge