Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video...
authorCarl Hetherington <cth@carlh.net>
Fri, 21 Dec 2012 23:10:39 +0000 (23:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 21 Dec 2012 23:10:39 +0000 (23:10 +0000)
commit93dfaa552333ac587c2d38a715cdc5f3763cab7b
treeae06ee8e0fd598be9dda1abe7434f0c7484d3db8
parent914a93ee4dd48583b057305f463bee3fb2254cc7
parente754a107a0003a7dcc84aaa3d1f01bac4d5591fd
Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video-player