Merge branch 'master' of git.carlh.net:git/cdist
-rw-r--r-- 12 .gitignore
-rwxr-xr-x 34077 cdist
-rwxr-xr-x 3277 cdistvm