Merge branch 'working-dir-changes' of git.carlh.net:git/cdist into working-dir-changes
-rwxr-xr-x 25189 cdist