Fix clang-format not found error message
Merge branch 'master' of bitbucket.org:infektor/autoformat

Conflicts:
	CMakeLists.txt
Merge branch 'master' of github.com:kbenzie/git-cmake-format