Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:43:31 +0000 (12:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 11:43:31 +0000 (12:43 +0100)
commit11bf5a4d69665b783ad0e3da6dbc9ca307d6b06a
tree64fc6df36d3e2f7f4ea8b8bf3ba99beb247424a3
parentd180057f97583db8870a0efd989eb21424dea801
parenta4e7f2fe00fcec204de6562d0b8eba9ca80207cd
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0