Merge branch 'master' of git://git.schottelius.org/cdist
Merge branch 'master' of ssh://github.com/rfnash/cdist