Merge branch 'own-mxf' of /home/carl/git/dvdomatic into own-mxf
authorCarl Hetherington <cth@carlh.net>
Fri, 20 Jul 2012 01:42:47 +0000 (02:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 20 Jul 2012 01:42:47 +0000 (02:42 +0100)
commit2525b527f279a130155d40b7ee57057897270915
tree7c6f946c9aaa3c8e7956d8de39600d034cbd9380
parentd7085ececc4d57830fd77afa7c4b5cd51bb5f381
parenta81e35ba9a8807e1b13c2a6c4133bbf4ff36859a
Merge branch 'own-mxf' of /home/carl/git/dvdomatic into own-mxf