Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:11:56 +0000 (12:11 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:11:56 +0000 (12:11 +0100)
commit934e2522589c5955092e6be003c4c13381fb3c34
treeafdfa92fb969ecd4352c826f19ecd79be3f96a9d
parent1d347f4ed0f7840236a91477075f4dc7af16f23d
parent0b32d082ca67ae1d31c1196a194a09f314dd0986
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0