Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 29 May 2013 22:20:27 +0000 (23:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 29 May 2013 22:20:27 +0000 (23:20 +0100)

Trivial merge