Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 29 May 2013 18:58:12 +0000 (19:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 29 May 2013 18:58:12 +0000 (19:58 +0100)

Trivial merge