Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 22:22:12 +0000 (23:22 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 22:22:12 +0000 (23:22 +0100)
commit7b721e7bfe0dd35957c8f56b7ec430aa21114971
tree856cb7357cadd8e0ce8ed41c9271506aa5236b65
parentafee1b6e8a7fcc3b6ae1e176cc5751156d8ebb34
parent462383278536475550640738bdda42dfb7c0c1c9
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0