Merge branch 'master' of /home/carl/git/dvdomatic
-rw-r--r-- 103 .gitignore
-rw-r--r-- 317 Notes
drwxr-xr-x - dvd
drwxr-xr-x - hacks