Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
-rw-r--r-- 153 .gitignore
-rw-r--r-- 489 Notes
drwxr-xr-x - dvd
drwxr-xr-x - hacks